Changeset 12328 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs

Timestamp:

04/20/15 11:28:32 (9 years ago)

Author:

pfleck

Message:

#2027
Added execution-time based termination criterion.
Restructured configuring termination criteria.

File:

• branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs (modified) (3 diffs)

branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs

@@ -28 +28 @@
 
 namespace HeuristicLab.Termination {
-  [Item("ComparisonTerminationCriterion", "")]
+  [Item("ComparisonTerminationCriterion", "An termination criterion which compares to values.")]
   [StorableClass]
-  public sealed class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
+  public class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
     public ILookupParameter<T> LeftSideParameter {
       get { return (ILookupParameter<T>)Parameters["LeftSide"]; }
@@ -47 +47 @@
 
     [StorableConstructor]
-    private ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
-    private ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
+    protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
+    protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -58 +58 @@
       Parameters.Add(new LookupParameter<T>("LeftSide", "The left side of the comparison."));
       Parameters.Add(new ValueLookupParameter<T>("RightSide", "The right side of the comparison."));
-      Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.Equal)) { Hidden = true });
+      Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
     }
     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)