Changeset 2385 for trunk/sources/HeuristicLab.GP.Algorithms/3.2

Timestamp:

09/24/09 11:37:28 (15 years ago)

Author:

gkronber

Message:

Implemented #762 (ValidationQuality improvment progress as additional stopping criterion for default StructId Engines)

Location:

trunk/sources/HeuristicLab.GP.Algorithms/3.2

Files:

• AlgorithmBase.cs (modified) (1 diff)
• OffspringSelectionGP.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs

@@ -495 +495 @@
     }
     #endregion
+
+
+    public static IOperator CombineTerminationCriterions(IOperator criterion1, IOperator criterion2) {
+      ConditionalBranch branch = new ConditionalBranch();
+      branch.GetVariableInfo("Condition").ActualName = "TerminationCriterion";
+      branch.AddSubOperator(new EmptyOperator());
+      branch.AddSubOperator(criterion2);
+
+      SequentialProcessor seq = new SequentialProcessor();
+      seq.AddSubOperator(criterion1);
+      seq.AddSubOperator(branch);
+
+      return seq;
+    }
   }
 }

trunk/sources/HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs

@@ -178 +178 @@
       selPresComparator.GetVariableInfo("Result").ActualName = "TerminationCriterion";
 
-      IOperator baseAndSelPresTerminationCriterion = CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator);
+      IOperator baseAndSelPresTerminationCriterion = AlgorithmBase.CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator);
 
       GreaterThanComparator evalSolutionsComparer = new GreaterThanComparator();
@@ -185 +185 @@
       evalSolutionsComparer.GetVariableInfo("Result").ActualName = "TerminationCriterion";
 
-      IOperator combinedTerminationCritertion = CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer);
+      IOperator combinedTerminationCritertion = AlgorithmBase.CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer);
 
       terminationCritertion.OperatorGraph.AddOperator(combinedTerminationCritertion);
       terminationCritertion.OperatorGraph.InitialOperator = combinedTerminationCritertion;
       return terminationCritertion;
-    }
-
-    private IOperator CombineTerminationCriterions(IOperator criterion1, IOperator criterion2) {
-      ConditionalBranch branch = new ConditionalBranch();
-      branch.GetVariableInfo("Condition").ActualName = "TerminationCriterion";
-      branch.AddSubOperator(new EmptyOperator());
-      branch.AddSubOperator(criterion2);
-
-      SequentialProcessor seq = new SequentialProcessor();
-      seq.AddSubOperator(criterion1);
-      seq.AddSubOperator(branch);
-
-      return seq;
     }