Changeset 12159 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

Timestamp:

03/09/15 10:32:47 (10 years ago)

Author:

pfleck

Message:

#2350

• Changed the SteadyStateMatingPoolCreator to put the mating pool in the working scope.
• Added the ScopeIndexAssigner for setting the correct layer number.
• Adapted the AlpsSsGeneticAlgorithmMainLoop.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs (modified) (3 diffs)

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

@@ -135 +135 @@
       var layerProcessor = new /*Layer*/UniformSubScopesProcessor();
       var layerVariableCreator = new VariableCreator() { Name = "Initialize Layer" };
+      var layerNumberCreator = new ScopeIndexAssigner() { Name = "Create Layer Number" };
       var layerSolutionsCreator = new SolutionsCreator();
       var initializeAgeProcessor = new UniformSubScopesProcessor();
@@ -154 +155 @@
       layersProcessor.TargetScopeParameter.ActualName = "Layers";
       layersProcessor.Operator = layerCreator;
+      layersProcessor.Successor = initializeEvaluatedSolutions;
 
       layerCreator.NumberOfSubScopesParameter.ActualName = "NumberOfLayers";
@@ -160 +162 @@
 
       layerProcessor.Operator = layerVariableCreator;
-      layerProcessor.Successor = initializeEvaluatedSolutions;
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("LayerResults"));
-      layerVariableCreator.Successor = layerSolutionsCreator;
+      layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer"));
+      layerVariableCreator.Successor = layerNumberCreator;
+
+      layerNumberCreator.ValueParameter.ActualName = "Layer";
+      layerNumberCreator.Successor = layerSolutionsCreator;
 
       layerSolutionsCreator.NumberOfSolutionsParameter.ActualName = LayerSizeParameter.Name;