Changeset 12410 for branches/TerminationCriteria/HeuristicLab.Termination

Timestamp:

06/01/15 14:21:02 (9 years ago)

Author:

pfleck

Message:

#2027

• Added IThresholdTerminator interface for more flexibility. The ThresholdTerminatorView now uses the interface instead of a concrete terminator.
• Added MaximumIterationsTerminator and SingleObjectiveQualityTerminator as common used Terminators.

Location:

branches/TerminationCriteria/HeuristicLab.Termination/3.3

Files:

• HeuristicLab.Termination-3.3.csproj (modified) (2 diffs)
• IThresholdTerminator.cs (added)
• MaximumIterationsTerminator.cs (added)
• SingleObjectiveQualityTerminator.cs (added)
• TerminationOperator.cs (modified) (1 diff)
• ThresholdTerminator.cs (modified) (1 diff)
• Views/ThresholdTerminatorView.Designer.cs (modified) (1 diff)
• Views/ThresholdTerminatorView.cs (modified) (3 diffs)

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

@@ -73 +73 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -141 +145 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="IThresholdTerminator.cs" />
+    <Compile Include="MaximumIterationsTerminator.cs" />
+    <Compile Include="SingleObjectiveQualityTerminator.cs" />
     <Compile Include="ThresholdTerminator.cs" />
     <Compile Include="Views\ThresholdTerminatorView.cs">

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

@@ -82 +82 @@
     public override IOperation InstrumentedApply() {
       var next = new OperationCollection(base.InstrumentedApply());
-      if (TerminateParameter.ActualValue != null && TerminateParameter.ActualValue.Value) {
+      if (TerminateParameter.ActualValue.Value) {
         if (TerminateBranch != null) next.Insert(0, ExecutionContext.CreateOperation(TerminateBranch));
       } else {

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

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

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

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

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 
@@ -29 +26 @@
 
   [View("ThresholdTerminator View")]
-  [Content(typeof(ThresholdTerminator<>), true)]
-  public partial class ThresholdTerminatorView<T> : ItemView where T : class, IItem, IComparable, IStringConvertibleValue, new() {
+  [Content(typeof(IThresholdTerminator), true)]
+  public partial class ThresholdTerminatorView : ItemView {
 
-    public new ThresholdTerminator<T> Content {
-      get { return (ThresholdTerminator<T>)base.Content; }
+    public new IThresholdTerminator Content {
+      get { return (IThresholdTerminator)base.Content; }
       set { base.Content = value; }
     }
@@ -45 +42 @@
       viewHost.Content = null;
       if (Content != null) {
-        if (Content.ThresholdParameter.Value != null)
-          viewHost.Content = Content.ThresholdParameter.Value;
+        if (Content.ThresholdParameter.ActualValue != null)
+          viewHost.Content = Content.ThresholdParameter.ActualValue;
         else
           viewHost.Content = Content.ThresholdParameter;