Changeset 12366 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTimeTerminationCriterion.cs

Timestamp:

04/29/15 17:04:43 (9 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.

File:

• branches/TerminationCriteria/HeuristicLab.Termination/3.3/ExecutionTimeTimeTerminationCriterion.cs (modified) (3 diffs)

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;