Changeset 12444 for branches/TerminationCriteria

Timestamp:

06/15/15 11:08:52 (9 years ago)

Author:

pfleck

Message:

#2027

• Removed ISingleValueTerminator and used ThresholdTerminator for the View instead.
• Added missing description in SingleObjectiveQualityTerminator.
• Added ITerminationBasedOperator which contains the terminate-flag.

Location:

branches/TerminationCriteria/HeuristicLab.Termination/3.3

Files:

• HeuristicLab.Termination-3.3.csproj (modified) (1 diff)
• ISingleValueTerminator.cs (deleted)
• ITerminationBasedOperator.cs (added)
• ITerminator.cs (modified) (1 diff)
• SingleObjectiveQualityTerminator.cs (modified) (1 diff)
• TerminationOperator.cs (modified) (1 diff)
• ThresholdTerminator.cs (modified) (1 diff)
• Views/ThresholdTerminatorView.Designer.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/SingleValueTerminatorView.Designer.cs) (1 diff)
• Views/ThresholdTerminatorView.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/SingleValueTerminatorView.cs) (3 diffs)

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

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

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

@@ -26 +26 @@
   /// An interface which represents an operator for checking a termination criterion.
   /// </summary>
-  public interface ITerminator : IOperator {
+  public interface ITerminator : ITerminationBasedOperator {
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Termination {
-  [Item("SingleObjectiveQualityTerminator", "")]
+  [Item("SingleObjectiveQualityTerminator", "A termination criterion which uses a quality parameter (eg. current best quality) for termination.")]
+  [StorableClass]
   public class SingleObjectiveQualityTerminator : ComparisonTerminator<DoubleValue> {
+    [StorableConstructor]
+    protected SingleObjectiveQualityTerminator(bool deserializing) : base(deserializing) { }
+    protected SingleObjectiveQualityTerminator(SingleObjectiveQualityTerminator original, Cloner cloner)
+      : base(original, cloner) { }
     public SingleObjectiveQualityTerminator() { }
 

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

@@ -30 +30 @@
   [Item("TerminationOperator", "An operator which either calls the terminate- or the continue branch.")]
   [StorableClass]
-  public sealed class TerminationOperator : InstrumentedOperator {
+  public sealed class TerminationOperator : InstrumentedOperator, ITerminationBasedOperator {
     public ILookupParameter<ITerminator> TerminationParameter {
       get { return (ILookupParameter<ITerminator>)Parameters["Termination"]; }

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

@@ -30 +30 @@
   [Item("ThresholdTerminator", "Base class for all termination criteria which specifies some threshold.")]
   [StorableClass]
-  public abstract class ThresholdTerminator<T> : Terminator, ISingleValueTerminator where T : class, IItem, IStringConvertibleValue, new() {
-    IParameter ISingleValueTerminator.SingleValueParameter {
-      get { return ThresholdParameter; }
-    }
+  public abstract class ThresholdTerminator<T> : Terminator where T : class, IItem, IStringConvertibleValue, new() {
     [Storable]
     private IFixedValueParameter<T> thresholdParameter;

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

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

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
@@ -26 +28 @@
 
   [View("ThresholdTerminator View")]
-  [Content(typeof(ISingleValueTerminator), true)]
-  public partial class SingleValueTerminatorView : ItemView {
+  [Content(typeof(ThresholdTerminator<>), true)]
+  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IStringConvertibleValue, new() {
 
-    public new ISingleValueTerminator Content {
-      get { return (ISingleValueTerminator)base.Content; }
+    public new ThresholdTerminator<T> Content {
+      get { return (ThresholdTerminator<T>)base.Content; }
       set { base.Content = value; }
     }
 
-    public SingleValueTerminatorView() {
+    public ThresholdTerminatorView() {
       InitializeComponent();
     }
@@ -42 +44 @@
       viewHost.Content = null;
       if (Content != null) {
-        viewHost.Content = Content.SingleValueParameter.ActualValue ?? Content.SingleValueParameter;
+        viewHost.Content = Content.ThresholdParameter.ActualValue ?? Content.ThresholdParameter;
       }
     }