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

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)

File:

• trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs (modified) (1 diff)

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;
+    }
   }
 }