Changeset 7323


Ignore:
Timestamp:
01/13/12 00:13:33 (8 years ago)
Author:
ascheibe
Message:

#1745 added multiple reduction operations

Location:
branches/HiveHiveEngine
Files:
2 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs

    r7322 r7323  
    181181      Comparator checkIslandGenerationsReachedMaximum = new Comparator();
    182182      ConditionalBranch checkContinueEvolution = new ConditionalBranch();
    183       SubScopesIntReducer generationsReducer = new SubScopesIntReducer();
    184       AllSubScopesIntReducer evaluatedSolutionsReducer = new AllSubScopesIntReducer();
     183      IntDataReducer generationsReducer = new IntDataReducer();
     184      IntDataReducer evaluatedSolutionsReducer = new IntDataReducer();
    185185      Placeholder islandAnalyzer2 = new Placeholder();
    186186      UniformSubScopesProcessor uniformSubScopesProcessor5 = new UniformSubScopesProcessor();
     
    270270      generationsReducer.ParameterToReduce.ActualName = islandGenerationsCounter.ValueParameter.ActualName;
    271271      generationsReducer.TargetParameterName.Value = new StringValue("Generations");
     272      generationsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Min);
    272273
    273274      evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
    274275      evaluatedSolutionsReducer.ParameterToReduce.ActualName = IslandEvaluatedSolutions.Name;
    275276      evaluatedSolutionsReducer.TargetParameterName.Value = new StringValue(EvaluatedSolutionsParameter.Name);
     277      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Sum);
    276278
    277279      emigrantsSelector.Name = "Emigrants Selector (placeholder)";
  • branches/HiveHiveEngine/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

    r7322 r7323  
    118118    <Compile Include="Assigner.cs" />
    119119    <Compile Include="AlgorithmOperator.cs" />
    120     <Compile Include="AllSubScopesIntReducer.cs" />
     120    <Compile Include="IntDataReducer.cs" />
     121    <Compile Include="ReductionType.cs" />
    121122    <Compile Include="ReductionTypes.cs" />
    122     <Compile Include="SubScopesIntReducer.cs" />
    123123    <Compile Include="MultiOperator.cs" />
    124124    <Compile Include="Operator.cs" />
  • branches/HiveHiveEngine/HeuristicLab.Operators/3.3/ReductionTypes.cs

    r7322 r7323  
    2323  public enum ReductionTypes {
    2424    Sum,
     25    Prod,
     26    Min,
    2527    Max,
    26     Min,
    2728    Avg
    2829  }
Note: See TracChangeset for help on using the changeset viewer.