Changeset 11590

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.

Location:

branches/ALPS

Files:

• HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs (modified) (6 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/EldersEmigrator.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.ALPS/3.3/LastSubScopeCloner.cs (added)
• HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs (modified) (7 diffs)
• HeuristicLab.Algorithms.ALPS/3.3/OpenNewLayerCalculator.cs (modified) (3 diffs)
• HeuristicLab.Operators/3.3/FirstSubScopeProcessor.cs (modified) (1 diff)
• HeuristicLab.Operators/3.3/LastSubScopeProcessor.cs (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/ExpressionCalculator.cs (modified) (1 diff)

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

@@ -183 +183 @@
       get { return OperatorGraph.Iterate().OfType<SolutionsCreator>().First(); }
     }
-
     private AlpsGeneticAlgorithmMainLoop MainLoop {
       get { return OperatorGraph.Iterate().OfType<AlpsGeneticAlgorithmMainLoop>().First(); }
@@ -255 +254 @@
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer", new IntValue(0)));
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results", new ResultCollection()));
       layerVariableCreator.Successor = layerSolutionsCreator;
 
@@ -266 +266 @@
       initializeAge.Successor = null;
 
-      initializeLocalEvaluatedSolutions.ValueParameter.ActualName = "EvaluatedSolutions";
+      initializeLocalEvaluatedSolutions.ValueParameter.ActualName = "LayerEvaluatedSolutions";
       initializeLocalEvaluatedSolutions.Successor = null;
 
       initializeGlobalEvaluatedSolutions.ReductionOperation.Value.Value = ReductionOperations.Sum;
       initializeGlobalEvaluatedSolutions.TargetOperation.Value.Value = ReductionOperations.Assign;
-      initializeGlobalEvaluatedSolutions.ParameterToReduce.ActualName = "EvaluatedSolutions";
+      initializeGlobalEvaluatedSolutions.ParameterToReduce.ActualName = "LayerEvaluatedSolutions";
       initializeGlobalEvaluatedSolutions.TargetParameter.ActualName = "EvaluatedSolutions";
       initializeGlobalEvaluatedSolutions.Successor = resultsCollector;
@@ -373 +373 @@
       SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
-      MainLoop.EldersEmigrator.SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-      MainLoop.EldersEmigrator.SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+      MainLoop.LayerUpdator.SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+      MainLoop.LayerUpdator.SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
 
     }

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

@@ -55 +55 @@
       get { return OperatorGraph.Iterate().OfType<EldersEmigrator>().First(); }
     }
+    public LayerUpdator LayerUpdator {
+      get { return OperatorGraph.Iterate().OfType<LayerUpdator>().First(); }
+    }
 
     [StorableConstructor]
@@ -74 +77 @@
       var initAnalyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var initLayerAnalyzerProcessor = new SubScopesProcessor();
+      var layerVariableCreator = new VariableCreator() { Name = "Initialize Layer" };
       var initLayerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
       var matingPoolProcessor = new UniformSubScopesProcessor();
+      var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
       var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
       var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
@@ -101 +106 @@
       initAnalyzerPlaceholder.Successor = initLayerAnalyzerProcessor;
 
-      initLayerAnalyzerProcessor.Operators.Add(initLayerAnalyzerPlaceholder);
+      initLayerAnalyzerProcessor.Operators.Add(layerVariableCreator);
       initLayerAnalyzerProcessor.Successor = matingPoolCreator;
+
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("LayerEvaluatedSolutions"));
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results"));
+      layerVariableCreator.Successor = initLayerAnalyzerPlaceholder;
 
       initLayerAnalyzerPlaceholder.OperatorParameter.ActualName = LayerAnalyzerParameter.Name;
@@ -110 +119 @@
 
       matingPoolProcessor.Parallel.Value = true;
-      matingPoolProcessor.Operator = mainOperator;
+      matingPoolProcessor.Operator = initializeLayer;
       matingPoolProcessor.Successor = generationsIcrementor;
+
+      initializeLayer.LeftSideParameter.ActualName = "LayerEvaluatedSolutions";
+      initializeLayer.RightSideParameter.Value = new IntValue(0);
+      initializeLayer.Successor = mainOperator;
 
       generationsIcrementor.ValueParameter.ActualName = "Generations";
@@ -149 +162 @@
       var selector = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Selector");
       var crossover = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Crossover");
+      var subScopesCounter = mainLoop.OperatorGraph.Iterate().OfType<SubScopesCounter>().First();
       var elitesMerger = mainLoop.OperatorGraph.Iterate().OfType<MergingReducer>().First();
 
@@ -164 +178 @@
       ageCalculator.Successor = crossoverSuccessor;
 
+      // When counting the evaluated solutions, write in LayerEvaluatedSolutions
+      subScopesCounter.ValueParameter.ActualName = "LayerEvaluatedSolutions";
+      subScopesCounter.AccumulateParameter.Value = new BoolValue(false);
+
       // Instead of generational loop after merging of elites, increment ages of all individuals
       var processor = new UniformSubScopesProcessor();

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

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 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;
@@ -40 +38 @@
     public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
       get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-
-    public SolutionsCreator SolutionsCreator {
-      get { return OperatorGraph.Iterate().OfType<SolutionsCreator>().First(); }
     }
 
@@ -77 +71 @@
       selectorProsessor.Successor = shiftToRightMigrator;
 
+      eldersSelector.CopySelected = new BoolValue(false);
       eldersSelector.Successor = null;
 
@@ -99 +94 @@
       bestSelector.QualityParameter.ActualName = QualityParameter.Name;
       bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
+      bestSelector.CopySelected = new BoolValue(false);
       bestSelector.Successor = rightReducer;
 

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -83 +83 @@
     <Compile Include="EldersEmigrator.cs" />
     <Compile Include="EldersSelector.cs" />
+    <Compile Include="LastSubScopeCloner.cs" />
     <Compile Include="LayerUpdator.cs" />
     <Compile Include="MatingPoolCreator.cs" />

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";

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

@@ -45 +45 @@
       get { return (ILookupParameter<IntValue>)Parameters["OpenLayers"]; }
     }
-    private IValueParameter<BoolValue> OpenNewLayerParameter {
-      get { return (IValueParameter<BoolValue>)Parameters["OpenNewLayer"]; }
+    private ILookupParameter<BoolValue> OpenNewLayerParameter {
+      get { return (ILookupParameter<BoolValue>)Parameters["OpenNewLayer"]; }
     }
 
@@ -63 +63 @@
       Parameters.Add(new LookupParameter<IntValue>("NumberOfLayers"));
       Parameters.Add(new LookupParameter<IntValue>("OpenLayers"));
-      Parameters.Add(new ValueParameter<BoolValue>("OpenNewLayer"));
+      Parameters.Add(new LookupParameter<BoolValue>("OpenNewLayer"));
     }
 
@@ -73 +73 @@
       var openNewLayer = OpenNewLayerParameter;
 
-      openNewLayer.Value = new BoolValue(openLayers < numberOfLayers && generations >= ageLimits[openLayers - 1]);
+      openNewLayer.ActualValue = new BoolValue(openLayers < numberOfLayers && generations >= ageLimits[openLayers - 1]);
 
       return base.Apply();

branches/ALPS/HeuristicLab.Operators/3.3/FirstSubScopeProcessor.cs

@@ -29 +29 @@
 namespace HeuristicLab.Operators {
   [Item("FirstSubScopeProsessor", "An operator which applies a specified operator on the first sub-scope.")]
-  public class FirstSubScopeProcessor : SingleSuccessorOperator {
+  [StorableClass]
+  public sealed class FirstSubScopeProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }

branches/ALPS/HeuristicLab.Operators/3.3/LastSubScopeProcessor.cs

@@ -29 +29 @@
 namespace HeuristicLab.Operators {
   [Item("LastSubScopeProsessor", "An operator which applies a specified operator on the last sub-scope.")]
-  public class LastSubScopeProcessor : SingleSuccessorOperator {
+  [StorableClass]
+  public sealed class LastSubScopeProcessor : SingleSuccessorOperator {
     private OperatorParameter OperatorParameter {
       get { return (OperatorParameter)Parameters["Operator"]; }

branches/ALPS/HeuristicLab.Optimization.Operators/3.3/ExpressionCalculator.cs

@@ -78 +78 @@
 predicates:
   ==, <, >, isnull, not
-array index:
-  []
 stack manipulation:
   drop swap dup