Changeset 7323

Timestamp:

01/13/12 00:13:33 (13 years ago)

Author:

ascheibe

Message:

#1745 added multiple reduction operations

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/AllSubScopesIntReducer.cs (deleted)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntDataReducer.cs (added)
• HeuristicLab.Operators/3.3/ReductionType.cs (added)
• HeuristicLab.Operators/3.3/ReductionTypes.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/SubScopesIntReducer.cs (deleted)

branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs

@@ -181 +181 @@
       Comparator checkIslandGenerationsReachedMaximum = new Comparator();
       ConditionalBranch checkContinueEvolution = new ConditionalBranch();
-      SubScopesIntReducer generationsReducer = new SubScopesIntReducer();
-      AllSubScopesIntReducer evaluatedSolutionsReducer = new AllSubScopesIntReducer();
+      IntDataReducer generationsReducer = new IntDataReducer();
+      IntDataReducer evaluatedSolutionsReducer = new IntDataReducer();
       Placeholder islandAnalyzer2 = new Placeholder();
       UniformSubScopesProcessor uniformSubScopesProcessor5 = new UniformSubScopesProcessor();
@@ -270 +270 @@
       generationsReducer.ParameterToReduce.ActualName = islandGenerationsCounter.ValueParameter.ActualName;
       generationsReducer.TargetParameterName.Value = new StringValue("Generations");
+      generationsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Min);
 
       evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
       evaluatedSolutionsReducer.ParameterToReduce.ActualName = IslandEvaluatedSolutions.Name;
       evaluatedSolutionsReducer.TargetParameterName.Value = new StringValue(EvaluatedSolutionsParameter.Name);
+      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Sum);
 
       emigrantsSelector.Name = "Emigrants Selector (placeholder)";

branches/HiveHiveEngine/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -118 +118 @@
     <Compile Include="Assigner.cs" />
     <Compile Include="AlgorithmOperator.cs" />
-    <Compile Include="AllSubScopesIntReducer.cs" />
+    <Compile Include="IntDataReducer.cs" />
+    <Compile Include="ReductionType.cs" />
     <Compile Include="ReductionTypes.cs" />
-    <Compile Include="SubScopesIntReducer.cs" />
     <Compile Include="MultiOperator.cs" />
     <Compile Include="Operator.cs" />

branches/HiveHiveEngine/HeuristicLab.Operators/3.3/ReductionTypes.cs

@@ -23 +23 @@
   public enum ReductionTypes {
     Sum,
+    Prod,
+    Min,
     Max,
-    Min,
     Avg
   }