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

Timestamp:

03/05/15 15:35:15 (9 years ago)

Author:

pfleck

Message:

#2350

• Changed PopulationSize parameter to IntValue.
• Implemented TryMoveUp procedure in AlpsSsMover.

File:

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

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

@@ -71 +71 @@
 
       var variableCreator = new VariableCreator() { Name = "Initialize" };
-      var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" }; // TODO LayerSubScopeProcessor for Array conversion
+      var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" };
       var isLayerZeroComperator = new Comparator() { Name = "IsLayerZero = Layer == 0" };
       var isLayerZeroBranch = new ConditionalBranch() { Name = "IsLayerZero?" };
@@ -95 +95 @@
       var resetTargetIndex = new Assigner() { Name = "TargetIndex = 0" };
       var clearMatingPool = new SubScopesRemover() { Name = "Clear WorkingScope" };
-      var tryMoveUp = new EmptyOperator() { Name = "Try Move Up" }; // TODO
-      var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" }; // TODO
+      var tryMoveUp = new AlpsSsMover() { Name = "Try Move Up" };
+      var removeWorkingScope = new LeftReducer() { Name = "Remove Working Scope" };
       var incrIterations = new IntCounter() { Name = "Incr. Iterations" };
+      var layerAnalyzerProcessor = new UniformSubScopesProcessor();
+      var layerAnalyzer = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" };
@@ -109 +111 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("TargetIndex", new IntValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations"));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("MatingPoolSize", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("ValidParents", new BoolValue(false)));
       variableCreator.Successor = randomScopeProcessor;
 
@@ -161 +165 @@
       selectRandomTargetIndex.MinimumParameter.Value = new IntValue(0);
       selectRandomTargetIndex.MaximumParameter.ActualName = "PopulationSize";
+      selectRandomTargetIndex.MaximumParameter.Value = null;
       selectRandomTargetIndex.Successor = copyLayer;
 
@@ -199 +204 @@
       clearMatingPool.Successor = createRandomIndividual;
 
-      tryMoveUp.Successor = setNewIndividual;
-
-      setNewIndividual.Successor = incrIterations;
+      tryMoveUp.Successor = removeWorkingScope;
+
+      removeWorkingScope.Successor = incrIterations;
 
       incrIterations.ValueParameter.ActualName = "Iterations";
       incrIterations.Increment = new IntValue(1);
-      incrIterations.Successor = analyzer;
+      incrIterations.Successor = layerAnalyzerProcessor;
+
+      layerAnalyzerProcessor.Operator = layerAnalyzer;
+      layerAnalyzerProcessor.Successor = analyzer;
+
+      layerAnalyzer.OperatorParameter.ActualName = "LayerAnalyzer";
 
       analyzer.OperatorParameter.ActualName = "Analyzer";