Changeset 11676

Timestamp:

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

Author:

pfleck

Message:

#2269 Added LayerPopulationSize variable (for PopulationSizeAnalyzer)

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (5 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (1 diff)
• EldersEmigrator.cs (modified) (3 diffs)
• MergingReducerCalculator.cs (modified) (2 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
   }
 }

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

@@ -132 +132 @@
       generationsIcrementor.Successor = evaluatedSolutionsReducer;
 
-      evaluatedSolutionsReducer.ParameterToReduce.ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsReducer.ParameterToReduce.ActualName = "LayerEvaluatedSolutions";
       evaluatedSolutionsReducer.TargetParameter.ActualName = "EvaluatedSolutions";
       evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);

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

@@ -60 +60 @@
       var subScopesCounter = new SubScopesCounter();
       // TODO: if expression calculator supports int, use expression calculator
-      var countCalculator = new MergingReducerCalculator() { Name = "NumSubScopes = Min(NumSubScopes, PopulationSize)" };
+      var countCalculator = new MergingReducerCalculator() { Name = "LayerPopulationSize = Min(LayerPopulationSize, PopulationSize)" };
       //var countCalculator = new ExpressionCalculator() { Name = "NumSubScopes = Min(NumSubScopes, PopulationSize)" };
       var bestSelector = new BestSelector();
@@ -81 +81 @@
       mergingReducer.Successor = subScopesCounter;
 
-      subScopesCounter.ValueParameter.ActualName = "NumSubScopes";
+      subScopesCounter.ValueParameter.ActualName = "LayerPopulationSize";
       subScopesCounter.AccumulateParameter.Value = new BoolValue(false);
       subScopesCounter.Successor = countCalculator;
@@ -91 +91 @@
       countCalculator.Successor = bestSelector;
 
-      bestSelector.NumberOfSelectedSubScopesParameter.ActualName = "NumSubScopes";
+      bestSelector.NumberOfSelectedSubScopesParameter.ActualName = "LayerPopulationSize";
       bestSelector.QualityParameter.ActualName = QualityParameter.Name;
       bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;

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

@@ -35 +35 @@
       get { return (ILookupParameter<IntValue>)Parameters["PopulationSize"]; }
     }
-    private ILookupParameter<IntValue> NumSubScopesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["NumSubScopes"]; }
+    private ILookupParameter<IntValue> LayerPopulationSizeParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["LayerPopulationSize"]; }
     }
 
@@ -50 +50 @@
       : base() {
       Parameters.Add(new LookupParameter<IntValue>("PopulationSize"));
-      Parameters.Add(new LookupParameter<IntValue>("NumSubScopes"));
+      Parameters.Add(new LookupParameter<IntValue>("LayerPopulationSize"));
     }
 
     public override IOperation Apply() {
       int populationSize = PopulationSizeParameter.ActualValue.Value;
-      int numSubScopes = NumSubScopesParameter.ActualValue.Value;
+      int numSubScopes = LayerPopulationSizeParameter.ActualValue.Value;
 
-      NumSubScopesParameter.ActualValue.Value = Math.Min(populationSize, numSubScopes);
+      LayerPopulationSizeParameter.ActualValue.Value = Math.Min(populationSize, numSubScopes);
 
       return base.Apply();