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

Timestamp:

04/29/15 16:34:33 (9 years ago)

Author:

pfleck

Message:

#2027 Changed a few things to better show single value criteria.

File:

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

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

@@ -48 +48 @@
     [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();
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -59 +64 @@
       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.GreaterOrEqual)) { Hidden = true });
+
+      Initialize();
     }
     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
@@ -71 +78 @@
       RightSideParameter.Value = rightSideValue;
       Comparison.Value = comparison;
+    }
+
+    private void Initialize() {
+      RightSideParameter.ToStringChanged += (s, a) => OnToStringChanged();
     }
 
@@ -95 +106 @@
       }
     }
+
+    public override string ToString() {
+      if (RightSideParameter.Value == null) return Name;
+      else return Name + ": " + RightSideParameter.Value;
+    }
   }
 }