Changeset 12366 for branches

Timestamp:

04/29/15 17:04:43 (10 years ago)

Author:

pfleck

Message:

#2027 Added a base class ThresholdTerminationCriterion for generalization of the view, which shows only a single value threshold now, and of the ToString mechanic.

Location:

branches/TerminationCriteria

Files:

• HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Termination/3.3/ComparisonTerminationCriterion.cs (modified) (4 diffs)
• HeuristicLab.Termination/3.3/ExecutionTimeTimeTerminationCriterion.cs (modified) (3 diffs)
• HeuristicLab.Termination/3.3/HeuristicLab.Termination-3.3.csproj (modified) (1 diff)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminationCriterionView.Designer.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ComparisonTerminationCriterionView.Designer.cs) (2 diffs)
• HeuristicLab.Termination/3.3/Views/ThresholdTerminationCriterionView.cs (moved) (moved from branches/TerminationCriteria/HeuristicLab.Termination/3.3/Views/ComparisonTerminationCriterionView.cs) (2 diffs)

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

@@ -490 +490 @@
         qualityTerminationCriterion.Name = maximization ? "Maximum Quality" : "Minimum Quality";
         qualityTerminationCriterion.Comparison = new Comparison(maximization ? ComparisonType.GreaterOrEqual : ComparisonType.LessOrEqual);
-        qualityTerminationCriterion.LeftSideParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
-        qualityTerminationCriterion.RightSideParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
+        qualityTerminationCriterion.ValueParameter.ActualName = qualityAnalyzer.CurrentBestQualityParameter.Name;
+        qualityTerminationCriterion.ThresholdParameter.Value = new DoubleValue(maximization ? double.MaxValue : double.MinValue);
       }
     }

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

@@ -30 +30 @@
   [Item("ComparisonTerminationCriterion", "An termination criterion which compares to values.")]
   [StorableClass]
-  public class ComparisonTerminationCriterion<T> : TerminationCriterion where T : class, IItem, IComparable {
-    public ILookupParameter<T> LeftSideParameter {
-      get { return (ILookupParameter<T>)Parameters["LeftSide"]; }
+  public class ComparisonTerminationCriterion<T> : ThresholdTerminationCriterion<T> where T : class, IItem, IComparable {
+    public ILookupParameter<T> ValueParameter {
+      get { return (ILookupParameter<T>)Parameters["Value"]; }
     }
-    public IValueLookupParameter<T> RightSideParameter {
-      get { return (IValueLookupParameter<T>)Parameters["RightSide"]; }
-    }
+
     private ValueParameter<Comparison> ComparisonParameter {
       get { return (ValueParameter<Comparison>)Parameters["Comparison"]; }
@@ -48 +46 @@
     [StorableConstructor]
     protected ComparisonTerminationCriterion(bool deserializing) : base(deserializing) { }
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      Initialize();
-    }
     protected ComparisonTerminationCriterion(ComparisonTerminationCriterion<T> original, Cloner cloner)
-      : base(original, cloner) {
-      Initialize();
-    }
+      : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ComparisonTerminationCriterion<T>(this, cloner);
@@ -61 +53 @@
     public ComparisonTerminationCriterion()
       : base() {
-      Parameters.Add(new LookupParameter<T>("LeftSide", "The left side of the comparison."));
-      Parameters.Add(new ValueLookupParameter<T>("RightSide", "The right side of the comparison."));
+      Parameters.Add(new LookupParameter<T>("Value", "The left side value of the comparison."));
       Parameters.Add(new ValueParameter<Comparison>("Comparison", "The type of comparison.", new Comparison(ComparisonType.GreaterOrEqual)) { Hidden = true });
-
-      Initialize();
     }
     public ComparisonTerminationCriterion(string leftSideActualName, string rightSideActualName, ComparisonType comparison = ComparisonType.GreaterOrEqual)
       : this() {
-      LeftSideParameter.ActualName = leftSideActualName;
-      RightSideParameter.ActualName = rightSideActualName;
+      ValueParameter.ActualName = leftSideActualName;
+      ThresholdParameter.ActualName = rightSideActualName;
       Comparison.Value = comparison;
     }
     public ComparisonTerminationCriterion(string leftSideActualName, T rightSideValue, ComparisonType comparison = ComparisonType.GreaterOrEqual)
       : this() {
-      LeftSideParameter.ActualName = leftSideActualName;
-      RightSideParameter.Value = rightSideValue;
+      ValueParameter.ActualName = leftSideActualName;
+      ThresholdParameter.Value = rightSideValue;
       Comparison.Value = comparison;
     }
 
-    private void Initialize() {
-      RightSideParameter.ToStringChanged += (s, a) => OnToStringChanged();
-    }
-
     protected override bool CheckTermination() {
-      IComparable lhs = LeftSideParameter.ActualValue;
-      IComparable rhs = RightSideParameter.ActualValue;
+      IComparable lhs = ValueParameter.ActualValue;
+      IComparable rhs = ThresholdParameter.ActualValue;
 
       int i = lhs.CompareTo(rhs);
@@ -107 +92 @@
     }
 
-    public override string ToString() {
-      if (RightSideParameter.Value == null) return Name;
-      else return Name + ": " + RightSideParameter.Value;
-    }
+
   }
 }

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

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -30 +29 @@
   [Item("ExecutionTimeTimeTerminationCriterion", "")]
   [StorableClass]
-  public class ExecutionTimeTimeTerminationCriterion : TerminationCriterion {
-
-    private IValueParameter<TimeSpanValue> MaximumExecutionTimeParameter {
-      get { return (IValueParameter<TimeSpanValue>)Parameters["MaximumExecutionTime"]; }
-    }
+  public class ExecutionTimeTimeTerminationCriterion : ThresholdTerminationCriterion<TimeSpanValue> {
 
     [Storable]
@@ -52 +47 @@
     public ExecutionTimeTimeTerminationCriterion(IExecutable executable, TimeSpan maximumExecutionTime) {
       this.executable = executable;
-      Parameters.Add(new ValueParameter<TimeSpanValue>("MaximumExecutionTime", "The maximum execution time of an algortihm.", new TimeSpanValue(maximumExecutionTime)));
+      ThresholdParameter.Value = new TimeSpanValue(maximumExecutionTime);
+
+      Name = "Maximum Execution Time";
     }
 
     protected override bool CheckTermination() {
-      var max = MaximumExecutionTimeParameter.Value.Value;
+      var max = ThresholdParameter.Value.Value;
 
       return executable.ExecutionTime > max;

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

@@ -141 +141 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Views\ComparisonTerminationCriterionView.cs">
+    <Compile Include="ThresholdTerminationCriterion.cs" />
+    <Compile Include="Views\ThresholdTerminationCriterionView.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="Views\ComparisonTerminationCriterionView.Designer.cs">
-      <DependentUpon>ComparisonTerminationCriterionView.cs</DependentUpon>
+    <Compile Include="Views\ThresholdTerminationCriterionView.Designer.cs">
+      <DependentUpon>ThresholdTerminationCriterionView.cs</DependentUpon>
     </Compile>
     <Compile Include="ITerminationCriterion.cs" />

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

@@ -21 +21 @@
 
 namespace HeuristicLab.Termination.Views {
-  partial class ComparisonTerminationCriterionView<T> {
+  partial class ThresholdTerminationCriterionView<T> {
     /// <summary> 
     /// Required designer variable.
@@ -62 +62 @@
       this.viewHost.ViewType = null;
       // 
-      // ComparisonTerminationCriterionView
+      // ThresholdTerminationCriterionView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.viewHost);
-      this.Name = "ComparisonTerminationCriterionView";
+      this.Name = "ThresholdTerminationCriterionView";
       this.ResumeLayout(false);
 

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

@@ -27 +27 @@
 namespace HeuristicLab.Termination.Views {
 
-  [View("ComparisonTerminationCriterion View")]
-  [Content(typeof(ComparisonTerminationCriterion<>), true)]
-  public partial class ComparisonTerminationCriterionView<T> : ItemView where T : class, IItem, IComparable {
+  [View("ThresholdTerminationCriterion View")]
+  [Content(typeof(ThresholdTerminationCriterion<>), true)]
+  public partial class ThresholdTerminationCriterionView<T> : ItemView where T : class, IItem, IComparable {
 
-    public new ComparisonTerminationCriterion<T> Content {
-      get { return (ComparisonTerminationCriterion<T>)base.Content; }
+    public new ThresholdTerminationCriterion<T> Content {
+      get { return (ThresholdTerminationCriterion<T>)base.Content; }
       set { base.Content = value; }
     }
 
-    public ComparisonTerminationCriterionView() {
+    public ThresholdTerminationCriterionView() {
       InitializeComponent();
     }
@@ -44 +44 @@
       viewHost.Content = null;
       if (Content != null) {
-        if (Content.RightSideParameter.Value != null)
-          viewHost.Content = Content.RightSideParameter.Value;
+        if (Content.ThresholdParameter.Value != null)
+          viewHost.Content = Content.ThresholdParameter.Value;
         else
-          viewHost.Content = Content.RightSideParameter;
+          viewHost.Content = Content.ThresholdParameter;
       }
     }