Changeset 13111 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/ReseedingController.cs

Timestamp:

11/03/15 17:09:44 (8 years ago)

Author:

pfleck

Message:

#2269

• Instead of hidden execution scope change logic in LayerReseeder, the new ReseedingController makes the scope change more obvious by using an OperatorParameter.
• Instead of the classes for EldersEmigrator, LayerOpener and LayerReseeder the operator graph is created in the AlpsGeneticAlgorithmMainLoop using CombinedOperator.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/ReseedingController.cs (moved) (moved from branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerReseeder.cs) (3 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/ReseedingController.cs

@@ -20 +20 @@
 #endregion
 
-using System.Drawing;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("LayerReseeder", "An operator that encapsulates the reseeding of the lowest layer in ALPS.")]
+  [Item("ReseedingController", "An operator that controls if reseeding is needed.")]
   [StorableClass]
-  public sealed class LayerReseeder : SingleSuccessorOperator, IOperatorGraphOperator {
-    public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Module; }
-    }
-    public override Image ItemImage {
-      get {
-        if (Breakpoint) return HeuristicLab.Common.Resources.VSImageLibrary.BreakpointActive;
-        else return base.ItemImage;
-      }
-    }
-
+  public sealed class ReseedingController : SingleSuccessorOperator {
     private ILookupParameter<IntValue> GenerationsParameter {
       get { return (ILookupParameter<IntValue>)Parameters["Generations"]; }
@@ -49 +37 @@
       get { return (ILookupParameter<IntValue>)Parameters["AgeGap"]; }
     }
+    public OperatorParameter FirstLayerOperatorParameter {
+      get { return (OperatorParameter)Parameters["FirstLayerOperator"]; }
+    }
 
-    [Storable]
-    private OperatorGraph operatorGraph;
-    public OperatorGraph OperatorGraph {
-      get { return operatorGraph; }
+    public IOperator FirstLayerOperator {
+      get { return FirstLayerOperatorParameter.Value; }
+      set { FirstLayerOperatorParameter.Value = value; }
     }
 
     [StorableConstructor]
-    private LayerReseeder(bool deserializing)
+    private ReseedingController(bool deserializing)
       : base(deserializing) { }
 
-    private LayerReseeder(LayerReseeder original, Cloner cloner)
+    private ReseedingController(ReseedingController original, Cloner cloner)
       : base(original, cloner) {
-      operatorGraph = cloner.Clone(original.operatorGraph);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new LayerReseeder(this, cloner);
+      return new ReseedingController(this, cloner);
     }
 
-    public LayerReseeder()
+    public ReseedingController()
       : base() {
       Parameters.Add(new LookupParameter<IntValue>("Generations"));
       Parameters.Add(new LookupParameter<IntValue>("AgeGap"));
-
-      operatorGraph = new OperatorGraph();
-
-      var removeIndividuals = new SubScopesRemover();
-      var createIndividuals = new SolutionsCreator();
-      var initializeAgeProsessor = new UniformSubScopesProcessor();
-      var initializeAge = new VariableCreator() { Name = "Initialize Age" };
-      var incrEvaluatedSolutionsAfterReseeding = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
-
-      OperatorGraph.InitialOperator = removeIndividuals;
-
-      removeIndividuals.Successor = createIndividuals;
-
-      createIndividuals.NumberOfSolutionsParameter.ActualName = "PopulationSize";
-      createIndividuals.Successor = initializeAgeProsessor;
-
-      initializeAgeProsessor.Operator = initializeAge;
-      initializeAgeProsessor.Successor = incrEvaluatedSolutionsAfterReseeding;
-
-      initializeAge.CollectedValues.Add(new ValueParameter<DoubleValue>("Age", new DoubleValue(0)));
-      initializeAge.Successor = null;
-
-      incrEvaluatedSolutionsAfterReseeding.ValueParameter.ActualName = "EvaluatedSolutions";
-      incrEvaluatedSolutionsAfterReseeding.AccumulateParameter.Value = new BoolValue(true);
-      incrEvaluatedSolutionsAfterReseeding.Successor = null;
+      Parameters.Add(new OperatorParameter("FirstLayerOperator"));
     }
 
@@ -106 +71 @@
       if (generations % ageGap == 0) {
         var layerZeroScope = ExecutionContext.Scope.SubScopes[0];
-        if (operatorGraph.InitialOperator != null)
-          next.Insert(0, ExecutionContext.CreateChildOperation(operatorGraph.InitialOperator, layerZeroScope));
+        if (FirstLayerOperator != null)
+          next.Insert(0, ExecutionContext.CreateChildOperation(FirstLayerOperator, layerZeroScope));
       }
       return next;