Changeset 12411 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/ThresholdTerminator.cs

Timestamp:

06/01/15 16:47:32 (9 years ago)

Author:

pfleck

Message:

#2027

• Removed MaximumIterationsTerminator and MaximumEvaluatedSolutionsTermimator because they practically do the same.
• Add the possibility for ThresholdTerminators to use a foreign parameter (e.g. MaximumSelectionPressure). This way the terminator can use parameters which are still relevant for the algorithm and still provide consistent management of the terminators.
• Renamed IThresholdTerminator to ISingleValueTerminator.

File:

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

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

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-
 namespace HeuristicLab.Termination {
   [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
-  public abstract class ThresholdTerminator<T> : Terminator, IThresholdTerminator where T : class, IItem, IStringConvertibleValue, new() {
+  public abstract class ThresholdTerminator<T> : Terminator, ISingleValueTerminator where T : class, IItem, IStringConvertibleValue, new() {
+    [Storable]
+    private IFixedValueParameter<T> thresholdParameter;
     public IFixedValueParameter<T> ThresholdParameter {
-      get { return (IFixedValueParameter<T>)Parameters["Threshold"]; }
+      get { return thresholdParameter; }
+      set {
+        if (value == null) throw new ArgumentNullException("Threshold parameter must not be null.");
+        if (value.Value == null) throw new ArgumentNullException("Threshold parameter value must not be null.");
+        if (thresholdParameter == value) return;
+
+        if (thresholdParameter != null) Parameters.Remove(thresholdParameter);
+        thresholdParameter = value;
+        Parameters.Add(thresholdParameter);
+        OnThresholdParameterChanged();
+      }
     }
-    IParameter IThresholdTerminator.ThresholdParameter {
+    IParameter ISingleValueTerminator.ThresholdParameter {
       get { return ThresholdParameter; }
     }
@@ -51 +62 @@
     protected ThresholdTerminator(ThresholdTerminator<T> original, Cloner cloner)
       : base(original, cloner) {
+      thresholdParameter = cloner.Clone(original.thresholdParameter);
       Initialize();
     }
@@ -58 +70 @@
       : base() {
       if (threshold == null) throw new ArgumentNullException("threshold");
-      Parameters.Add(new FixedValueParameter<T>("Threshold", "The limit of the termiation criterion.", threshold));
+      thresholdParameter = new FixedValueParameter<T>("Threshold", "The limit of the termiation criterion.", threshold);
+      Parameters.Add(thresholdParameter);
       Initialize();
     }
 
     private void Initialize() {
-      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+      RegisterThresholdParameterEvents();
     }
 
@@ -73 +86 @@
     }
 
+    private void OnThresholdParameterChanged() {
+      RegisterThresholdParameterEvents();
+    }
+
+    private void RegisterThresholdParameterEvents() {
+      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+    }
+
     public override string ToString() {
       if (ThresholdParameter.Value == null) return Name;