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

Timestamp:

04/29/15 17:04:43 (9 years ago)

Author:

pfleck

Message:

#2027 Added a base class ThresholdTerminationCriterion for generalization of the view, which shows only a single value threshold now, and of the ToString mechanic.

File:

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

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

@@ -30 +30 @@
   [Item("ComparisonTerminationCriterion", "An termination criterion which compares to values.")]
   [StorableClass]
-  public class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
-    public ILookupParameter<T> LeftSideParameter {
-      get { return (ILookupParameter<T>)Parameters["LeftSide"]; }
+  public class ComparisonTerminationCriterion<T> : ThresholdTerminationCriterion<T> where T : class, IItem, IComparable {
+    public ILookupParameter<T> ValueParameter {
+      get { return (ILookupParameter<T>)Parameters["Value"]; }
     }
-    public IValueLookupParameter<T> RightSideParameter {
-      get { return (IValueLookupParameter<T>)Parameters["RightSide"]; }
-    }
+
     private ValueParameter<Comparison> ComparisonParameter {
       get { return (ValueParameter<Comparison>)Parameters["Comparison"]; }
@@ -48 +46 @@
     [StorableConstructor]
     protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      Initialize();
-    }
     protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
-      : base(original, cloner) {
-      Initialize();
-    }
+      : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ComparisonTerminationCriterion<T>(this, cloner);
@@ -61 +53 @@
     public ComparisonTerminationCriterion()
       : base() {
-      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 LookupParameter<T>("Value", "The left side value of the comparison."));
       Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
-
-      Initialize();
     }
     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
       : this() {
-      LeftSideParameter.ActualName = leftSideActualName;
-      RightSideParameter.ActualName = rightSideActualName;
+      ValueParameter.ActualName = leftSideActualName;
+      ThresholdParameter.ActualName = rightSideActualName;
       Comparison.Value = comparison;
     }
     public ComparisonTerminationCriterion(string leftSideActualName, T rightSideValue, ComparisonType comparison = ComparisonType.GreaterOrEqual)
       : this() {
-      LeftSideParameter.ActualName = leftSideActualName;
-      RightSideParameter.Value = rightSideValue;
+      ValueParameter.ActualName = leftSideActualName;
+      ThresholdParameter.Value = rightSideValue;
       Comparison.Value = comparison;
     }
 
-    private void Initialize() {
-      RightSideParameter.ToStringChanged += (s, a) => OnToStringChanged();
-    }
-
     protected override bool CheckTermination() {
-      IComparable lhs = LeftSideParameter.ActualValue;
-      IComparable rhs = RightSideParameter.ActualValue;
+      IComparable lhs = ValueParameter.ActualValue;
+      IComparable rhs = ThresholdParameter.ActualValue;
 
       int i = lhs.CompareTo(rhs);
@@ -107 +92 @@
     }
 
-    public override string ToString() {
-      if (RightSideParameter.Value == null) return Name;
-      else return Name + ": " + RightSideParameter.Value;
-    }
+
   }
 }