Changeset 13117 for branches

Timestamp:

11/04/15 17:28:03 (9 years ago)

Author:

pfleck

Message:

#2269 Added ReduceToPopulationSize parameter to control if the population is reduced to the PopulationSize after elder migration (default) or the layer can have more than PopulationSize individuals until the next generation.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (1 diff)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)

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

@@ -293 +293 @@
 
       Parameters.Add(new ValueParameter<IntValue>("MatingPoolRange", "The range of layers used for creating a mating pool. (1 = current + previous layer)", new IntValue(1)) { Hidden = true });
+      Parameters.Add(new ValueParameter<BoolValue>("ReduceToPopulationSize", "Reduce the LayerPopulationSize after elder migration to PopulationSize", new BoolValue(true)) { Hidden = true });
 
       Parameters.Add(new ValueParameter<MultiTerminator>("Terminator", "The termination criteria which sould be checked.", new MultiTerminator()));

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

@@ -162 +162 @@
       var mergingReducer = new MergingReducer();
       var subScopesCounter = new SubScopesCounter();
+      var reduceToPopulationSizeBranch = new ConditionalBranch() { Name = "ReduceToPopulationSize?" };
       var countCalculator = new ExpressionCalculator() { Name = "LayerPopulationSize = Min(LayerPopulationSize, PopulationSize)" };
       var bestSelector = new BestSelector();
@@ -180 +181 @@
       subScopesCounter.ValueParameter.ActualName = "LayerPopulationSize";
       subScopesCounter.AccumulateParameter.Value = new BoolValue(false);
-      subScopesCounter.Successor = countCalculator;
+      subScopesCounter.Successor = reduceToPopulationSizeBranch;
+
+      reduceToPopulationSizeBranch.ConditionParameter.ActualName = "ReduceToPopulationSize";
+      reduceToPopulationSizeBranch.TrueBranch = countCalculator;
 
       countCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));