Changeset 7325

Timestamp:

01/13/12 14:21:43 (13 years ago)

Author:

ascheibe

Message:

#1745 added result storing operations for the reducer

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntDataReducer.cs (modified) (6 diffs)
• HeuristicLab.Operators/3.3/TargetOperationType.cs (added)
• HeuristicLab.Operators/3.3/TargetOperationTypes.cs (added)

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

@@ -271 +271 @@
       generationsReducer.TargetParameterName.Value = new StringValue("Generations");
       generationsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Min);
+      generationsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.Sum);
 
       evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
@@ -276 +277 @@
       evaluatedSolutionsReducer.TargetParameterName.Value = new StringValue(EvaluatedSolutionsParameter.Name);
       evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Sum);
+      evaluatedSolutionsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.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="TargetOperationType.cs" />
+    <Compile Include="TargetOperationTypes.cs" />
     <Compile Include="IntDataReducer.cs" />
     <Compile Include="ReductionType.cs" />

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

@@ -32 +32 @@
   [StorableClass]
   public sealed class IntDataReducer : SingleSuccessorOperator {
+    #region Parameter Properties
     public ScopeTreeLookupParameter<IntValue> ParameterToReduce {
       get { return (ScopeTreeLookupParameter<IntValue>)Parameters["ParameterToReduce"]; }
@@ -44 +45 @@
       get { return (ValueParameter<ReductionType>)Parameters["ReductionOperation"]; }
     }
+    public ValueParameter<TargetOperationType> TargetOperation {
+      get { return (ValueParameter<TargetOperationType>)Parameters["TargetOperation"]; }
+    }
+    #endregion
 
     [StorableConstructor]
@@ -52 +57 @@
     public IntDataReducer()
       : base() {
-      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("ParameterToReduce", "The actual parameter defined by TargetParameterName."));
-      Parameters.Add(new ValueLookupParameter<StringValue>("TargetParameterName", "Parameter name to add the value to.", new StringValue(string.Empty)));
+      #region Create parameters
+      Parameters.Add(new ScopeTreeLookupParameter<IntValue>("ParameterToReduce", "The parameter on which the reduction operation should be applied."));
+      Parameters.Add(new ValueLookupParameter<StringValue>("TargetParameterName", "Parameter to store the result in.", new StringValue(string.Empty)));
       Parameters.Add(new LookupParameter<IntValue>("TargetParameter", "The actual parameter defined by TargetParameterName."));
       Parameters.Add(new ValueParameter<ReductionType>("ReductionOperation", "The reduction operation to perform."));
+      Parameters.Add(new ValueParameter<TargetOperationType>("TargetOperation", "The target operation to perform."));
+      #endregion
     }
 
@@ -69 +77 @@
         if (TargetParameter.ActualValue == null) TargetParameter.ActualValue = new IntValue();
 
-        int result;
+        int result = 1;
         switch (ReductionOperation.Value.Value) {
           case ReductionTypes.Sum:
@@ -75 +83 @@
             break;
           case ReductionTypes.Prod:
-            result = 1;
             intValues.ForEach(x => result *= x.Value);
             break;
@@ -87 +94 @@
             result = intValues.Max(x => x.Value);
             break;
-          default:
-            throw new ArgumentException("Unknown ReductionType: " + ReductionOperation.Value.Value);
         }
-        //TODO: there should be at least a Set, Add and Mul operation
-        TargetParameter.ActualValue.Value += result;
+
+        switch (TargetOperation.Value.Value) {
+          case TargetOperationTypes.Set:
+            TargetParameter.ActualValue.Value = result;
+            break;
+          case TargetOperationTypes.Sum:
+            TargetParameter.ActualValue.Value += result;
+            break;
+          case TargetOperationTypes.Prod:
+            if (TargetParameter.ActualValue.Value == 0) TargetParameter.ActualValue.Value = 1;
+            TargetParameter.ActualValue.Value *= result;
+            break;
+        }
       }
       return base.Apply();