Changeset 12436

Timestamp:

06/12/15 15:13:36 (9 years ago)

Author:

mkommend

Message:

#2027: Improved code formatting for terminators.

Location:

branches/TerminationCriteria/HeuristicLab.Termination/3.3

Files:

• ComparisonTerminator.cs (modified) (2 diffs)
• ExecutionTimeTerminator.cs (modified) (1 diff)
• MultiTerminator.cs (modified) (1 diff)
• SingleObjectiveQualityTerminator.cs (modified) (1 diff)
• Terminator.cs (modified) (1 diff)
• ThresholdTerminator.cs (modified) (4 diffs)

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

@@ -79 +79 @@
     }
 
+    protected override bool CheckContinueCriterion() {
+      IComparable lhs = ComparisonValueParameter.ActualValue;
+      IComparable rhs = ThresholdParameter.Value;
+
+      return Comparison.Compare(lhs, rhs);
+    }
+
     private void Initialize() {
       ComparisonParameter.Value.ValueChanged += new EventHandler(Comparison_ValueChanged);
     }
-
-    public override void CollectParameterValues(IDictionary<string, IItem> values) {
-      base.CollectParameterValues(values);
-      values.Add(ComparisonValueParameter.Name, new StringValue(ComparisonValueParameter.ActualName));
-    }
-
     private void Comparison_ValueChanged(object sender, EventArgs e) {
       OnComparisonChanged();
@@ -95 +96 @@
     }
 
-    protected override bool CheckContinueCriterion() {
-      IComparable lhs = ComparisonValueParameter.ActualValue;
-      IComparable rhs = ThresholdParameter.Value;
-
-      return Comparison.Compare(lhs, rhs);
+    public override void CollectParameterValues(IDictionary<string, IItem> values) {
+      base.CollectParameterValues(values);
+      values.Add(ComparisonValueParameter.Name, new StringValue(ComparisonValueParameter.ActualName));
     }
 

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

@@ -53 +53 @@
     protected override bool CheckContinueCriterion() {
       var max = ThresholdParameter.Value.Value;
-
       return executable.ExecutionTime < max;
     }

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

@@ -37 +37 @@
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.FlagRed; }
-    }
-    public override Image ItemImage {
-      get {
-        if (Breakpoint) return HeuristicLab.Common.Resources.VSImageLibrary.BreakpointActive;
-        else return base.ItemImage;
-      }
     }
 

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

@@ -31 +31 @@
     public void Parameterize(IParameter qualityParameter, ISingleObjectiveHeuristicOptimizationProblem problem) {
       ComparisonValueParameter.ActualName = qualityParameter.Name;
-      if (problem != null) {
-        var maximizationParameter = (IValueParameter<BoolValue>)problem.MaximizationParameter;
-        if (maximizationParameter != null) {
-          bool maximization = maximizationParameter.Value.Value;
-          Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
-          Threshold.Value = maximization ? double.MaxValue : double.MinValue;
-        }
+      if (problem == null) return;
+
+      var maximizationParameter = (IValueParameter<BoolValue>)problem.MaximizationParameter;
+      if (maximizationParameter != null) {
+        bool maximization = maximizationParameter.Value.Value;
+        Comparison = maximization ? ComparisonType.Less : ComparisonType.Greater;
+        Threshold.Value = maximization ? double.MaxValue : double.MinValue;
       }
     }

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

@@ -53 +53 @@
       if (!TerminateParameter.ActualValue.Value) { // If terminate flag is already set, no need to check further termination criteria.
         bool terminate = !CheckContinueCriterion();
-        TerminateParameter.ActualValue = new BoolValue(terminate);
+        TerminateParameter.ActualValue.Value = terminate;
       }
       return base.Apply();

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

@@ -31 +31 @@
   [StorableClass]
   public abstract class ThresholdTerminator<T> : Terminator, ISingleValueTerminator where T : class, IItem, IStringConvertibleValue, new() {
+    IParameter ISingleValueTerminator.SingleValueParameter {
+      get { return ThresholdParameter; }
+    }
     [Storable]
     private IFixedValueParameter<T> thresholdParameter;
@@ -45 +48 @@
         OnThresholdParameterChanged();
       }
-    }
-    IParameter ISingleValueTerminator.SingleValueParameter {
-      get { return ThresholdParameter; }
     }
 
@@ -78 +78 @@
       RegisterThresholdParameterEvents();
     }
+    private void RegisterThresholdParameterEvents() {
+      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
+    }
+    private void OnThresholdParameterChanged() {
+      RegisterThresholdParameterEvents();
+    }
 
     private void Threshold_ValueChanged(object sender, EventArgs e) {
@@ -86 +92 @@
     }
 
-    private void OnThresholdParameterChanged() {
-      RegisterThresholdParameterEvents();
-    }
-
-    private void RegisterThresholdParameterEvents() {
-      Threshold.ValueChanged += new EventHandler(Threshold_ValueChanged);
-    }
-
     public override string ToString() {
       if (ThresholdParameter.Value == null) return Name;