Changeset 1239 for branches/CEDMA-Refactoring-Ticket419

Timestamp:

03/02/09 17:32:39 (16 years ago)

Author:

gkronber

Message:

Reintoduced MaxEvaluatedSolutions stopping criterion for hard-coded OffspringSelectionGP. #224 (Simple frontend for GP for non-expert users (similar to HeurisicLab.SGA))

File:

• branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffspringSelectionGP.cs (modified) (5 diffs)

branches/CEDMA-Refactoring-Ticket419/HeuristicLab.GP.StructureIdentification/OffspringSelectionGP.cs

@@ -39 +39 @@
   public class OffspringSelectionGP : StandardGP {
 
+    private IntData maxEvaluatedSolutions = new IntData();
+    public int MaxEvaluatedSolutions {
+      get { return maxEvaluatedSolutions.Data; }
+      set { maxEvaluatedSolutions.Data = value; }
+    }
+
     private DoubleData selectionPressureLimit = new DoubleData();
     public double SelectionPressureLimit {
@@ -60 +66 @@
       PopulationSize = 1000;
       Parents = 20;
-      MaxGenerations = 300;
+      MaxEvaluatedSolutions = 1000000;
       SelectionPressureLimit = 300;
       ComparisonFactor = 1.0;
@@ -69 +75 @@
       VariableInjector injector = (VariableInjector)base.CreateGlobalInjector();
       injector.RemoveVariable("TournamentSize");
+      injector.RemoveVariable("MaxGenerations");
+      injector.AddVariable(new HeuristicLab.Core.Variable("MaxEvaluatedSolutions", maxEvaluatedSolutions));
       injector.AddVariable(new HeuristicLab.Core.Variable("ComparisonFactor", comparisonFactor));
       injector.AddVariable(new HeuristicLab.Core.Variable("SelectionPressureLimit", selectionPressureLimit));
@@ -183 +191 @@
       seq.Name = "Loop Condition";
       LessThanComparator generationsComparator = new LessThanComparator();
-      generationsComparator.GetVariableInfo("LeftSide").ActualName = "Generations";
-      generationsComparator.GetVariableInfo("RightSide").ActualName = "MaxGenerations";
-      generationsComparator.GetVariableInfo("Result").ActualName = "GenerationsCondition";
+      generationsComparator.GetVariableInfo("LeftSide").ActualName = "EvaluatedSolutions";
+      generationsComparator.GetVariableInfo("RightSide").ActualName = "MaxEvaluatedSolutions";
+      generationsComparator.GetVariableInfo("Result").ActualName = "EvaluatedSolutionsCondition";
 
       LessThanComparator selPresComparator = new LessThanComparator();
@@ -193 +201 @@
       
       ConditionalBranch generationsCond = new ConditionalBranch();
-      generationsCond.GetVariableInfo("Condition").ActualName = "GenerationsCondition";
+      generationsCond.GetVariableInfo("Condition").ActualName = "EvaluatedSolutionsCondition";
 
       ConditionalBranch selPresCond = new ConditionalBranch();