Changeset 7391 for branches/HiveHiveEngine

Timestamp:

01/22/12 15:08:47 (13 years ago)

Author:

ascheibe

Message:

#1745 removed target operations, use reduction operations instead

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntDataReducer.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/ReductionOperation.cs (added)
• HeuristicLab.Operators/3.3/ReductionOperations.cs (added)
• HeuristicLab.Operators/3.3/ReductionType.cs (deleted)
• HeuristicLab.Operators/3.3/ReductionTypes.cs (deleted)
• HeuristicLab.Operators/3.3/TargetOperationType.cs (deleted)
• HeuristicLab.Operators/3.3/TargetOperationTypes.cs (deleted)

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

@@ -297 +297 @@
       if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
 
-      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name)) {
+        var stochasticOperator = selector as IStochasticOperator;
+        if (stochasticOperator != null)
+          stochasticOperator.RandomParameter.ActualName = "Global Random";
         EmigrantsSelectorParameter.ValidValues.Add(selector);
+      }
 
       foreach (IReplacer replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name))

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

@@ -270 +270 @@
       generationsReducer.Name = "Increment Generations";
       generationsReducer.ParameterToReduce.ActualName = islandGenerationsCounter.ValueParameter.ActualName;
-      generationsReducer.TargetParameterName.Value = new StringValue("Generations");
-      generationsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Min);
-      generationsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.Sum);
+      generationsReducer.TargetParameter.ActualName = "Generations";
+      generationsReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Min);
+      generationsReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
       evaluatedSolutionsReducer.ParameterToReduce.ActualName = IslandEvaluatedSolutions.Name;
-      evaluatedSolutionsReducer.TargetParameterName.Value = new StringValue(EvaluatedSolutionsParameter.Name);
-      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Sum);
-      evaluatedSolutionsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.Sum);
+      evaluatedSolutionsReducer.TargetParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      evaluatedSolutionsReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       emigrantsSelector.Name = "Emigrants Selector (placeholder)";

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

@@ -119 +119 @@
     <Compile Include="AlgorithmOperator.cs" />
     <Compile Include="SubScopesRandomCreator.cs" />
-    <Compile Include="TargetOperationType.cs" />
-    <Compile Include="TargetOperationTypes.cs" />
     <Compile Include="IntDataReducer.cs" />
-    <Compile Include="ReductionType.cs" />
-    <Compile Include="ReductionTypes.cs" />
+    <Compile Include="ReductionOperation.cs" />
+    <Compile Include="ReductionOperations.cs" />
     <Compile Include="MultiOperator.cs" />
     <Compile Include="Operator.cs" />

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

@@ -36 +36 @@
       get { return (ScopeTreeLookupParameter<IntValue>)Parameters["ParameterToReduce"]; }
     }
-    public ValueLookupParameter<StringValue> TargetParameterName {
-      get { return (ValueLookupParameter<StringValue>)Parameters["TargetParameterName"]; }
-    }
-    private LookupParameter<IntValue> TargetParameter {
+    public LookupParameter<IntValue> TargetParameter {
       get { return (LookupParameter<IntValue>)Parameters["TargetParameter"]; }
     }
-    public ValueParameter<ReductionType> ReductionOperation {
-      get { return (ValueParameter<ReductionType>)Parameters["ReductionOperation"]; }
+    public ValueParameter<ReductionOperation> ReductionOperation {
+      get { return (ValueParameter<ReductionOperation>)Parameters["ReductionOperation"]; }
     }
-    public ValueParameter<TargetOperationType> TargetOperation {
-      get { return (ValueParameter<TargetOperationType>)Parameters["TargetOperation"]; }
+    public ValueParameter<ReductionOperation> TargetOperation {
+      get { return (ValueParameter<ReductionOperation>)Parameters["TargetOperation"]; }
     }
     #endregion
@@ -59 +56 @@
       #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."));
+      Parameters.Add(new LookupParameter<IntValue>("TargetParameter", "The target variable in which the reduced value should be stored."));
+      Parameters.Add(new ValueParameter<ReductionOperation>("ReductionOperation", "The operation which is applied on the parameter to reduce."));
+      Parameters.Add(new ValueParameter<ReductionOperation>("TargetOperation", "The operation used to apply the reduced value to the target variable."));
       #endregion
     }
@@ -74 +70 @@
 
       if (intValues.Count() > 0) {
-        TargetParameter.ActualName = TargetParameterName.ActualValue.Value;
         if (TargetParameter.ActualValue == null) TargetParameter.ActualValue = new IntValue();
 
         int result = 1;
         switch (ReductionOperation.Value.Value) {
-          case ReductionTypes.Sum:
+          case ReductionOperations.Sum:
             result = intValues.Sum(x => x.Value);
             break;
-          case ReductionTypes.Prod:
+          case ReductionOperations.Prod:
             intValues.ForEach(x => result *= x.Value);
             break;
-          case ReductionTypes.Avg:
+          case ReductionOperations.Avg:
             result = (int)Math.Round(intValues.Average(x => x.Value));
             break;
-          case ReductionTypes.Min:
+          case ReductionOperations.Min:
             result = intValues.Min(x => x.Value);
             break;
-          case ReductionTypes.Max:
+          case ReductionOperations.Max:
             result = intValues.Max(x => x.Value);
             break;
+          default:
+            throw new InvalidOperationException("Operation " + ReductionOperation.Value.Value + " is not supported as ReductionOperation.");
         }
 
         switch (TargetOperation.Value.Value) {
-          case TargetOperationTypes.Set:
+          case ReductionOperations.Assign:
             TargetParameter.ActualValue.Value = result;
             break;
-          case TargetOperationTypes.Sum:
+          case ReductionOperations.Sum:
             TargetParameter.ActualValue.Value += result;
             break;
-          case TargetOperationTypes.Prod:
+          case ReductionOperations.Prod:
             if (TargetParameter.ActualValue.Value == 0) TargetParameter.ActualValue.Value = 1;
             TargetParameter.ActualValue.Value *= result;
             break;
+          default:
+            throw new InvalidOperationException("Operation " + TargetOperation.Value.Value + " is not supported as TargetOperation.");
         }
       }