Changeset 11590 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs

Timestamp:

11/26/14 17:22:19 (9 years ago)

Author:

pfleck

Message:

#2269

• Finished implementing LayerUpdator.
• Proper implemented per-layer results.
• Some bugfixes and wiring.
• Added LastSubScopeCloner. Note that the First/LastSubScopeCloner/Processor might be dropped and Left/Right-Selectors are used instead. Thanks to jkarder for this suggestion.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs (modified) (7 diffs)

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

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
@@ -32 +34 @@
   [StorableClass]
   public class LayerUpdator : AlgorithmOperator {
+
+    public SolutionsCreator SolutionsCreator {
+      get { return OperatorGraph.Iterate().OfType<SolutionsCreator>().First(); }
+    }
 
     [StorableConstructor]
@@ -50 +56 @@
       var openNewLayerCalculator = new OpenNewLayerCalculator();
       var openNewLayerBranch = new ConditionalBranch() { Name = "OpenNewLayer?" };
+      var layerCloner = new LastSubScopeCloner() { Name = "Copy Lower Layer" };
       var incrOpenLayers = new IntCounter() { Name = "Incr. OpenLayers" };
-      var layerScopeCreator = new SubScopesCreator();
       var newLayerProsessor = new LastSubScopeProcessor();
-      var localRandomCreator = new LocalRandomCreator();
-      var layerVariableCreator = new Assigner() { Name = "Init Layer" };
-      var copyPrevSubScope = new CombinedOperator() { Name = "Copy lower layer" };
-      //var mainOperator = new CombinedOperator() { Name = "Create Offsprings" };
+      var layerInitializer = new Assigner() { Name = "Init Layer" };
+      var incrEvaluatedSolutionsForNewLayer = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
+      var newResultCollectionAssigner = new Assigner() { Name = "Empty Results" };
       var regenerateLayerZeroProsessor = new FirstSubScopeProcessor();
       var subScopesRemover = new SubScopesRemover();
@@ -62 +67 @@
       var initializeAgeProsessor = new UniformSubScopesProcessor();
       var initializeAge = new VariableCreator() { Name = "Initialize Age" };
-      var incrEvaluatedSolutions = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
+      var incrEvaluatedSolutionsAfterReseeding = new SubScopesCounter() { Name = "Update EvaluatedSolutions" };
       var resetGenSlr = new Assigner() { Name = "Reset GenerationsSinceLastRefresh" };
 
@@ -77 +82 @@
       genSlrEqAgeGap.Successor = updateLayersBranch;
 
-      updateLayersBranch.ConditionParameter.ActualName = "Updatelayers";
+      updateLayersBranch.ConditionParameter.ActualName = "UpdateLayers";
       updateLayersBranch.TrueBranch = openNewLayerCalculator;
 
@@ -89 +94 @@
 
       openNewLayerBranch.ConditionParameter.ActualName = "OpenNewLayer";
-      openNewLayerBranch.TrueBranch = incrOpenLayers;
+      openNewLayerBranch.TrueBranch = layerCloner;
       openNewLayerBranch.Successor = regenerateLayerZeroProsessor;
+
+      layerCloner.Successor = newLayerProsessor;
+
+      newLayerProsessor.Operator = layerInitializer;
+      newLayerProsessor.Successor = incrOpenLayers;
+
+      layerInitializer.LeftSideParameter.ActualName = "Layer";
+      layerInitializer.RightSideParameter.ActualName = "OpenLayers";
+      layerInitializer.Successor = incrEvaluatedSolutionsForNewLayer;
+
+      incrEvaluatedSolutionsForNewLayer.ValueParameter.ActualName = "EvaluatedSolutions";
+      incrEvaluatedSolutionsForNewLayer.AccumulateParameter.Value = new BoolValue(true);
+      incrEvaluatedSolutionsForNewLayer.Successor = newResultCollectionAssigner;
+
+      newResultCollectionAssigner.LeftSideParameter.ActualName = "Results";
+      newResultCollectionAssigner.RightSideParameter.Value = new ResultCollection();
+      newResultCollectionAssigner.Successor = mainOperator;
+      // TODO mainOperator increment age
 
       incrOpenLayers.ValueParameter.ActualName = "OpenLayers";
       incrOpenLayers.Increment = new IntValue(1);
-      incrOpenLayers.Successor = layerScopeCreator;
-
-      layerScopeCreator.NumberOfSubScopesParameter.Value = new IntValue(1);
-      layerScopeCreator.Successor = newLayerProsessor;
-
-      newLayerProsessor.Operator = localRandomCreator;
-
-      localRandomCreator.Successor = layerVariableCreator;
-
-      layerVariableCreator.LeftSideParameter.ActualName = "Layer";
-      layerVariableCreator.RightSideParameter.ActualName = "Layer";
-      layerVariableCreator.Successor = copyPrevSubScope;
-
-      copyPrevSubScope.Successor = mainOperator;
+      incrOpenLayers.Successor = null;
 
       regenerateLayerZeroProsessor.Operator = subScopesRemover;
@@ -117 +127 @@
 
       initializeAgeProsessor.Operator = initializeAge;
-      initializeAgeProsessor.Successor = incrEvaluatedSolutions;
+      initializeAgeProsessor.Successor = incrEvaluatedSolutionsAfterReseeding;
 
       initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("Age", new IntValue(0)));
       initializeAge.Successor = null;
 
-      incrEvaluatedSolutions.ValueParameter.ActualName = "EvaluatedSolutions";
-      incrEvaluatedSolutions.Successor = null;
+      incrEvaluatedSolutionsAfterReseeding.ValueParameter.ActualName = "EvaluatedSolutions";
+      incrEvaluatedSolutionsAfterReseeding.AccumulateParameter.Value = new BoolValue(true);
+      incrEvaluatedSolutionsAfterReseeding.Successor = null;
 
       resetGenSlr.LeftSideParameter.ActualName = "GenerationsSinceLastRefresh";