Changeset 12094 for branches

Timestamp:

02/27/15 11:09:33 (10 years ago)

Author:

pfleck

Message:

#2269 Replaced the NumberOfSelectedSubScopesCalculator with an ExpressionCalculator.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• NumberOfSelectedSubScopesCalculator.cs (deleted)

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

@@ -178 +178 @@
     private GeneticAlgorithmMainLoop CreatePreparedGeneticAlgorithmMainLoop() {
       var mainLoop = new GeneticAlgorithmMainLoop();
-      var numberOfSelectedSubScopesCalculator = new NumberOfSelectedSubScopesCalculator();
+      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = (PopulationSize - Elites) * 2" };
       var selector = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Selector");
       var crossover = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Crossover");
@@ -186 +186 @@
       // Operator starts with numberOfSelectedSubScopesCalculator
       mainLoop.OperatorGraph.InitialOperator = numberOfSelectedSubScopesCalculator;
+      numberOfSelectedSubScopesCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));
+      numberOfSelectedSubScopesCalculator.CollectedValues.Add(new LookupParameter<IntValue>("Elites"));
+      numberOfSelectedSubScopesCalculator.ExpressionResultParameter.ActualName = "NumberOfSelectedSubScopes";
+      numberOfSelectedSubScopesCalculator.ExpressionParameter.Value = new StringValue("PopulationSize Elites - 2 * toint");
       numberOfSelectedSubScopesCalculator.Successor = selector;