Changeset 12271 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState

Timestamp:

03/31/15 13:18:59 (10 years ago)

Author:

pfleck

Message:

#2269 Added AgeInheritance as own type and value for consistent configuration.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (2 diffs)
• AlpsSsGeneticAlgorithmMainOperator.cs (modified) (2 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -131 +131 @@
       Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
       Parameters.Add(new ValueParameter<IntValue>("BatchSize", "Number of inner iterations before updates and analyzers are fired.", new IntValue(100)) { Hidden = true });
-      AgeInheritance = new ReductionOperation(ReductionOperations.Min);
 
       var randomCreator = new RandomCreator();
@@ -282 +281 @@
     }
 
+    protected override ReductionOperations GetAgeInheritanceReduction(AgeInheritance ageInheritance) {
+      switch (ageInheritance) {
+        case ALPS.AgeInheritance.Older: return ReductionOperations.Min;
+        case ALPS.AgeInheritance.Agerage: return ReductionOperations.Avg;
+        case ALPS.AgeInheritance.Younger: return ReductionOperations.Max;
+        default: throw new NotSupportedException("AgeInheritance " + ageInheritance + " is not supported.");
+      }
+    }
+
     protected override void ParameterizeStochasticOperator(IOperator @operator) {
       var stochasticOperator = @operator as IStochasticOperator;

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainOperator.cs

@@ -48 +48 @@
       var mutator = new Placeholder() { Name = "Mutator (Placeholder)" };
       var ageReducer = new DataReducer() { Name = "Calculate EvalsCreated" };
-      var lastMoveReducer = new DataReducer() { Name = "Calculate LastMove" };
+      var lastMoveAssigner = new Assigner() { Name = "Set LastMove" };
       var subScopesRemover = new SubScopesRemover();
       var evaluator = new Placeholder() { Name = "Evaluator (Placeholder)" };
@@ -71 +71 @@
 
       ageReducer.ParameterToReduce.ActualName = "EvalsCreated";
-      ageReducer.ReductionOperation.ActualName = "AgeInheritance";
+      ageReducer.ReductionOperation.ActualName = "AgeInheritanceReduction";
       ageReducer.ReductionOperation.Value = null;
       ageReducer.TargetParameter.ActualName = "EvalsCreated";
       ageReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
-      ageReducer.Successor = lastMoveReducer;
+      ageReducer.Successor = lastMoveAssigner;
 
-      lastMoveReducer.ParameterToReduce.ActualName = "LastMove";
-      lastMoveReducer.ReductionOperation.ActualName = "AgeInheritance";
-      lastMoveReducer.ReductionOperation.Value = null;
-      lastMoveReducer.TargetParameter.ActualName = "LastMove";
-      lastMoveReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Assign);
-      lastMoveReducer.Successor = subScopesRemover;
+      lastMoveAssigner.LeftSideParameter.ActualName = "LastMove";
+      lastMoveAssigner.RightSideParameter.ActualName = "EvaluatedSolutions";
+      lastMoveAssigner.Successor = subScopesRemover;
 
       subScopesRemover.Successor = evaluator;