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

Timestamp:

03/09/15 10:32:47 (9 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/AlpsSsGeneticAlgorithmMainLoop.cs (modified) (4 diffs)

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

@@ -71 +71 @@
 
       var variableCreator = new VariableCreator() { Name = "Initialize" };
+      var layersProcessor = new NamedSubScopeProcessor() { Name = "Process Layers" };
       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?" };
@@ -85 +85 @@
       var initializeAge = new Assigner() { Name = "Initialize Age" };
       var selectRandomTargetIndex = new RandomIntAssigner();
-      var copyLayer = new BestSelector();
-      var copyLayerProcessor = new SubScopesProcessor();
       var matingPoolCreator = new SteadyStateMatingPoolCreator() { Name = "Create MatingPool" };
+      var matingPoolProcessor = new NamedSubScopeProcessor() { Name = "Process MatingPool" };
       var matingPoolSize = new SubScopesCounter() { Name = "MatingPoolSize" };
       var matingPoolSizeMin2 = new Comparator() { Name = "ValidParents = MatingPoolSize >= 2" };
@@ -116 +115 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("MatingPoolSize", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("ValidParents", new BoolValue(false)));
-      variableCreator.Successor = randomScopeProcessor;
-
-      randomScopeProcessor.Operator = layerPopulationSizeCounter;
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("IsLayerZero", new BoolValue(false)));
+      variableCreator.Successor = layersProcessor;
+
+      layersProcessor.Operator = randomScopeProcessor;
+      layersProcessor.TargetScopeParameter.ActualName = "Layers";
+
+      randomScopeProcessor.Operator = isLayerZeroComperator;
       randomScopeProcessor.Successor = incrIterations;
-
-      layerPopulationSizeCounter.ValueParameter.ActualName = "LayerPopulationSize";
-      layerPopulationSizeCounter.AccumulateParameter.Value =  new BoolValue(false);
-      layerPopulationSizeCounter.Successor = isLayerZeroComperator;
 
       isLayerZeroComperator.LeftSideParameter.ActualName = "Layer";
@@ -171 +170 @@
       selectRandomTargetIndex.LeftSideParameter.ActualName = "TargetIndex";
       selectRandomTargetIndex.MinimumParameter.Value = new IntValue(0);
-      selectRandomTargetIndex.MaximumParameter.ActualName = "LayerPopulationSize";
+      selectRandomTargetIndex.MaximumParameter.ActualName = "LayerSize";
       selectRandomTargetIndex.MaximumParameter.Value = null;
-      selectRandomTargetIndex.Successor = copyLayer;
-
-      copyLayer.NumberOfSelectedSubScopesParameter.ActualName = "LayerPopulationSize";
-      copyLayer.CopySelected = new BoolValue(true);
-      copyLayer.Successor = copyLayerProcessor;
-
-      copyLayerProcessor.Operators.Add(new EmptyOperator());
-      copyLayerProcessor.Operators.Add(matingPoolCreator);
-
-      matingPoolCreator.Successor = matingPoolSize;
+      selectRandomTargetIndex.Successor = matingPoolCreator;
+
+      matingPoolCreator.Successor = matingPoolProcessor;
+
+      matingPoolProcessor.Operator = matingPoolSize;
+      matingPoolProcessor.TargetScopeParameter.ActualName = "WorkingScope";
 
       matingPoolSize.ValueParameter.ActualName = "MatingPoolSize";