Changeset 11590 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.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/AlpsGeneticAlgorithmMainLoop.cs (modified) (6 diffs)

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();