Changeset 12410 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views

Timestamp:

06/01/15 14:21:02 (10 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/Views

Files:

• ThresholdTerminatorView.Designer.cs (modified) (1 diff)
• ThresholdTerminatorView.cs (modified) (3 diffs)

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;