Changeset 12408 for branches

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.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Termination/3.3/ComparisonTerminator.cs (modified) (3 diffs)
• HeuristicLab.Termination/3.3/ThresholdTerminator.cs (modified) (4 diffs)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs (modified) (2 diffs)

branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -504 +504 @@
     }
     private void ParameterizeTerminators() {
+      qualityTerminator.ComparisonValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
       if (Problem != null) {
         var maximizationParameter = (IValueParameter<BoolValue>)Problem.MaximizationParameter;
@@ -509 +510 @@
           bool maximization = maximizationParameter.Value.Value;
           qualityTerminator.Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
-          qualityTerminator.Threshold.Value = maximization ? double.MinValue : double.MaxValue;
+          qualityTerminator.Threshold.Value = maximization ? double.MaxValue : double.MinValue;
         }
       }
-      qualityTerminator.ComparisonValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
     }
     private void ParameterizeComparisonFactorModifiers() {

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();
     }
 

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -29 +31 @@
   [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
-  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, new() {
+  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, IStringConvertibleValue, new() {
     public IFixedValueParameter<T> ThresholdParameter {
       get { return (IFixedValueParameter<T>)Parameters["Threshold"]; }
@@ -48 +50 @@
       Initialize();
     }
-    protected ThresholdTerminator(T threshold = default(T))
+    protected ThresholdTerminator()
+      : this(new T()) { }
+    protected ThresholdTerminator(T threshold)
       : base() {
+      if (threshold == null) throw new ArgumentNullException("threshold");
       Parameters.Add(new FixedValueParameter<T>("Threshold", "The limit of the termiation criterion.", threshold));
       Initialize();
@@ -55 +60 @@
 
     private void Initialize() {
-      ThresholdParameter.ToStringChanged += (s, a) => OnToStringChanged();
+      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+    }
+
+    private void Threshold_ValueChanged(object sender, EventArgs e) {
+      OnThresholdChanged();
+    }
+    protected virtual void OnThresholdChanged() {
+      OnToStringChanged();
     }
 

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs

@@ -22 +22 @@
 using System;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Termination.Views {
-  partial class ThresholdTerminatorView<T> where T : class, IItem, IComparable, new() {
+  partial class ThresholdTerminatorView<T> where T : class, IItem, IComparable, IStringConvertibleValue, new() {
     /// <summary> 
     /// Required designer variable.

branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
@@ -29 +30 @@
   [View("ThresholdTerminator View")]
   [Content(typeof(ThresholdTerminator<>), true)]
-  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IComparable, new() {
+  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IComparable, IStringConvertibleValue, new() {
 
     public new ThresholdTerminator<T> Content {