Changeset 12411 for branches/TerminationCriteria/HeuristicLab.Termination

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.

Location:

branches/TerminationCriteria/HeuristicLab.Termination/3.3

Files:

• ComparisonTerminator.cs (modified) (1 diff)
• HeuristicLab.Termination-3.3.csproj (modified) (1 diff)
• ISingleValueTerminator.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/IThresholdTerminator.cs) (1 diff)
• MaximumIterationsTerminator.cs (deleted)
• SingleObjectiveQualityTerminator.cs (modified) (1 diff)
• ThresholdTerminator.cs (modified) (4 diffs)
• Views/SingleValueTerminatorView.Designer.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.Designer.cs) (1 diff)
• Views/SingleValueTerminatorView.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ThresholdTerminatorView.cs) (1 diff)

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

@@ -71 +71 @@
       Comparison = comparison;
     }
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, IFixedValueParameter<T> thresholdParameter)
+      : this() {
+      ComparisonValueParameter.ActualName = comparisonValueActualName;
+      Comparison = comparison;
+      ThresholdParameter = thresholdParameter;
+    }
 
     private void Initialize() {

branches/TerminationCriteria/HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj

@@ -145 +145 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IThresholdTerminator.cs" />
-    <Compile Include="MaximumIterationsTerminator.cs" />
+    <Compile Include="ISingleValueTerminator.cs" />
     <Compile Include="SingleObjectiveQualityTerminator.cs" />
     <Compile Include="ThresholdTerminator.cs" />
-    <Compile Include="Views\ThresholdTerminatorView.cs">
+    <Compile Include="Views\SingleValueTerminatorView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Views\ThresholdTerminatorView.Designer.cs">
-      <DependentUpon>ThresholdTerminatorView.cs</DependentUpon>
+    <Compile Include="Views\SingleValueTerminatorView.Designer.cs">
+      <DependentUpon>SingleValueTerminatorView.cs</DependentUpon>
     </Compile>
     <Compile Include="ITerminator.cs" />

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

@@ -23 +23 @@
 
 namespace HeuristicLab.Termination {
-  public interface IThresholdTerminator : ITerminator {
+  public interface ISingleValueTerminator : ITerminator {
     IParameter ThresholdParameter { get; }
   }

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

@@ -27 +27 @@
   [Item("SingleObjectiveQualityTerminator", "")]
   public class SingleObjectiveQualityTerminator : ComparisonTerminator<DoubleValue> {
-    public SingleObjectiveQualityTerminator() {
-      Name = "Quality";
-    }
+    public SingleObjectiveQualityTerminator() { }
 
     public void Parameterize(IParameter qualityParameter, ISingleObjectiveHeuristicOptimizationProblem problem) {

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;

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Termination.Views {
-  partial class ThresholdTerminatorView {
+  partial class SingleValueTerminatorView {
     /// <summary> 
     /// Required designer variable.

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

@@ -26 +26 @@
 
   [View("ThresholdTerminator View")]
-  [Content(typeof(IThresholdTerminator), true)]
-  public partial class ThresholdTerminatorView : ItemView {
+  [Content(typeof(ISingleValueTerminator), true)]
+  public partial class SingleValueTerminatorView : ItemView {
 
-    public new IThresholdTerminator Content {
-      get { return (IThresholdTerminator)base.Content; }
+    public new ISingleValueTerminator Content {
+      get { return (ISingleValueTerminator)base.Content; }
       set { base.Content = value; }
     }
 
-    public ThresholdTerminatorView() {
+    public SingleValueTerminatorView() {
       InitializeComponent();
     }