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

Timestamp:

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

Author:

pfleck

Message:

#2269 Added LayerPopulationSize variable (for PopulationSizeAnalyzer)

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersEmigrator.cs (modified) (3 diffs)

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;