Changeset 12138 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

Timestamp:

03/05/15 13:35:38 (9 years ago)

Author:

pfleck

Message:

#2350

• Added the AlpsSsGeneticAlgorithmMainOperator.
• Changed some minor things.

File:

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

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -102 +102 @@
     #endregion
 
+    private AlpsSsGeneticAlgorithmMainLoop MainLoop {
+      get { return OperatorGraph.Iterate().OfType<AlpsSsGeneticAlgorithmMainLoop>().First(); }
+    }
+
     [StorableConstructor]
     private AlpsSsGeneticAlgorithm(bool deserializing)
@@ -160 +164 @@
       initializeAgeProcessor.Successor = initializeLayerPopulationSize;
 
-      initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("Age", new IntValue(1)));
+      initializeAge.CollectedValues.Add(new ValueParameter<IntValue>("EvalsCreated", new IntValue(1)));
 
       initializeLayerPopulationSize.ValueParameter.ActualName = "LayerPopulationSize";
@@ -237 +241 @@
     }
     private void ParameterizeMainLoop() {
-      //MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-      //MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+      MainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+      MainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       //MainLoop.MainOperator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
       //MainLoop.MainOperator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
@@ -247 +251 @@
       foreach (var selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
-        // Explicit setting of NumberOfSelectedSubScopesParameter is not required anymore because the NumberOfSelectedSubScopesCalculator calculates it itself
-        //selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize - Elites.Value)); 
+        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2);
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
         ParameterizeStochasticOperatorForLayer(selector);
@@ -272 +275 @@
     }
 
+    protected override void ParameterizeStochasticOperator(IOperator @operator) {
+      var stochasticOperator = @operator as IStochasticOperator;
+      if (stochasticOperator != null) {
+        stochasticOperator.RandomParameter.ActualName = "Random";
+        stochasticOperator.RandomParameter.Hidden = true;
+      }
+    }
     protected override void ParameterizeStochasticOperatorForLayer(IOperator @operator) {
       var stochasticOperator = @operator as IStochasticOperator;
       if (stochasticOperator != null) {
-        stochasticOperator.RandomParameter.ActualName = GlobalRandomCreator.Name;
+        stochasticOperator.RandomParameter.ActualName = "Random";
         stochasticOperator.RandomParameter.Hidden = true;
       }
     }
-
     #endregion