Changeset 12408 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs

Timestamp:

05/28/15 14:22:03 (9 years ago)

Author:

pfleck

Message:

#2027

• Added ValueChanged-events to Terminators.
• Fixed wiring bug of quality-based Terminator.

File:

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

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

@@ -30 +30 @@
   [Item("ComparisonTerminator", "An termination criterion which compares two values.")]
   [StorableClass]
-  public class ComparisonTerminator<T> : ThresholdTerminator<T> where T : class, IItem, IComparable, new() {
+  public class ComparisonTerminator<T> : ThresholdTerminator<T> where T : class, IItem, IComparable, IStringConvertibleValue, new() {
     public ILookupParameter<T> ComparisonValueParameter {
       get { return (ILookupParameter<T>)Parameters["ComparisonValue"]; }
@@ -57 +57 @@
       return new ComparisonTerminator<T>(this, cloner);
     }
+
+    public ComparisonTerminator()
+      : this(new T()) { }
     public ComparisonTerminator(T threshold)
       : base(threshold) {
@@ -70 +73 @@
 
     private void Initialize() {
-      ComparisonParameter.ToStringChanged += (s, a) => OnToStringChanged();
+      ComparisonParameter.Value.ValueChanged += new EventHandler(Comparison_ValueChanged);
+    }
+
+    private void Comparison_ValueChanged(object sender, EventArgs e) {
+      OnComparisonChanged();
+    }
+    protected virtual void OnComparisonChanged() {
+      OnToStringChanged();
     }