Changeset 11676 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

Timestamp:

12/10/14 09:51:08 (9 years ago)

Author:

pfleck

Message:

#2269 Added LayerPopulationSize variable (for PopulationSizeAnalyzer)

File:

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

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs

@@ -189 +189 @@
     }
 
+    #endregion
+
+    #region Preconfigured Analyzers
     [Storable]
     private BestAverageWorstQualityAnalyzer qualityAnalyzer;
@@ -235 +238 @@
       var initializeAgeProcessor = new UniformSubScopesProcessor();
       var initializeAge = new VariableCreator() { Name = "Initialize Age" };
-      var initializeLocalEvaluatedSolutions = new SubScopesCounter();
+      var initializeLayerPopulationSize = new SubScopesCounter() { Name = "Init LayerPopulationCounter" };
+      var initializeLocalEvaluatedSolutions = new Assigner() { Name = "Initialize LayerEvaluatedSolutions" };
       var initializeGlobalEvaluatedSolutions = new DataReducer() { Name = "Initialize EvaluatedSolutions" };
       var resultsCollector = new ResultsCollector();
@@ -263 +267 @@
 
       initializeAgeProcessor.Operator = initializeAge;
-      initializeAgeProcessor.Successor = initializeLocalEvaluatedSolutions;
+      initializeAgeProcessor.Successor = initializeLayerPopulationSize;
+
+      initializeLayerPopulationSize.ValueParameter.ActualName = "LayerPopulationSize";
+      initializeLayerPopulationSize.Successor = initializeLocalEvaluatedSolutions;
 
       initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("Age", new IntValue(0)));
       initializeAge.Successor = null;
 
-      initializeLocalEvaluatedSolutions.ValueParameter.ActualName = "LayerEvaluatedSolutions";
+      initializeLocalEvaluatedSolutions.LeftSideParameter.ActualName = "LayerEvaluatedSolutions";
+      initializeLocalEvaluatedSolutions.RightSideParameter.ActualName = "LayerPopulationSize";
       initializeLocalEvaluatedSolutions.Successor = null;
 
@@ -526 +534 @@
     #endregion
 
+    #region AgeLimits calculation
     private void RecalculateAgeLimits() {
       IEnumerable<int> scheme;
@@ -563 +572 @@
         yield return (int)Math.Pow(@base, i);
     }
+    #endregion
   }
 }