Changeset 12150 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

Timestamp:

03/06/15 13:24:42 (9 years ago)

Author:

pfleck

Message:

#2350 Fixed Bugs in Steady-State ALPS OperatorGraph and Mover.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs (modified) (6 diffs)

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

@@ -72 +72 @@
       var variableCreator = new VariableCreator() { Name = "Initialize" };
       var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" };
+      var layerPopulationSizeCounter = new SubScopesCounter() { Name = "Count LayerPopulationSize" };
       var isLayerZeroComperator = new Comparator() { Name = "IsLayerZero = Layer == 0" };
       var isLayerZeroBranch = new ConditionalBranch() { Name = "IsLayerZero?" };
@@ -97 +98 @@
       var tryMoveUp = new AlpsSsMover() { Name = "Try Move Up" };
       var removeWorkingScope = new LeftReducer() { Name = "Remove Working Scope" };
+      var incrementEvaluations = new IntCounter() { Name = "incr. EvaluatedSolutions" };
       var incrIterations = new IntCounter() { Name = "Incr. Iterations" };
       var layerAnalyzerProcessor = new UniformSubScopesProcessor();
@@ -116 +118 @@
       variableCreator.Successor = randomScopeProcessor;
 
-      randomScopeProcessor.Operator = isLayerZeroComperator;
+      randomScopeProcessor.Operator = layerPopulationSizeCounter;
+      randomScopeProcessor.Successor = incrIterations;
+
+      layerPopulationSizeCounter.ValueParameter.ActualName = "LayerPopulationSize";
+      layerPopulationSizeCounter.AccumulateParameter.Value =  new BoolValue(false);
+      layerPopulationSizeCounter.Successor = isLayerZeroComperator;
 
       isLayerZeroComperator.LeftSideParameter.ActualName = "Layer";
@@ -164 +171 @@
       selectRandomTargetIndex.LeftSideParameter.ActualName = "TargetIndex";
       selectRandomTargetIndex.MinimumParameter.Value = new IntValue(0);
-      selectRandomTargetIndex.MaximumParameter.ActualName = "PopulationSize";
+      selectRandomTargetIndex.MaximumParameter.ActualName = "LayerPopulationSize";
       selectRandomTargetIndex.MaximumParameter.Value = null;
       selectRandomTargetIndex.Successor = copyLayer;
@@ -178 +185 @@
 
       matingPoolSize.ValueParameter.ActualName = "MatingPoolSize";
+      matingPoolSize.AccumulateParameter.Value = new BoolValue(false);
       matingPoolSize.Successor = matingPoolSizeMin2;
 
@@ -206 +214 @@
       tryMoveUp.Successor = removeWorkingScope;
 
-      removeWorkingScope.Successor = incrIterations;
+      removeWorkingScope.Successor = incrementEvaluations;
+
+      incrementEvaluations.Increment = new IntValue(1);
+      incrementEvaluations.ValueParameter.ActualName = "EvaluatedSolutions";
 
       incrIterations.ValueParameter.ActualName = "Iterations";