Changeset 12447 for branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs

Timestamp:

06/15/15 15:47:47 (9 years ago)

Author:

pfleck

Message:

#2027

• Renamed TerminatonParameter to TerminatorParameter.
• Renamed Comparison to ComparisonType.

File:

• branches/TerminationCriteria/HeuristicLab.Termination/3.3/ComparisonTerminator.cs (modified) (4 diffs)

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

@@ -40 +40 @@
     }
 
-    public ComparisonType Comparison {
+    public ComparisonType ComparisonType {
       get { return ComparisonParameter.Value.Value; }
       set { ComparisonParameter.Value.Value = value; }
@@ -67 +67 @@
       Initialize();
     }
-    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, T threshold)
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparisonType, T threshold)
       : this(threshold) {
       ComparisonValueParameter.ActualName = comparisonValueActualName;
-      Comparison = comparison;
+      ComparisonType = comparisonType;
     }
-    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparison, IFixedValueParameter<T> thresholdParameter)
+    public ComparisonTerminator(string comparisonValueActualName, ComparisonType comparisonType, IFixedValueParameter<T> thresholdParameter)
       : this() {
       ComparisonValueParameter.ActualName = comparisonValueActualName;
-      Comparison = comparison;
+      ComparisonType = comparisonType;
       ThresholdParameter = thresholdParameter;
     }
@@ -83 +83 @@
       IComparable rhs = ThresholdParameter.Value;
 
-      return Comparison.Compare(lhs, rhs);
+      return ComparisonType.Compare(lhs, rhs);
     }
 
     private void Initialize() {
-      ComparisonParameter.Value.ValueChanged += new EventHandler(Comparison_ValueChanged);
+      ComparisonParameter.Value.ValueChanged += new EventHandler(ComparisonType_ValueChanged);
     }
-    private void Comparison_ValueChanged(object sender, EventArgs e) {
-      OnComparisonChanged();
+    private void ComparisonType_ValueChanged(object sender, EventArgs e) {
+      OnComparisonTypeChanged();
     }
-    protected virtual void OnComparisonChanged() {
+    protected virtual void OnComparisonTypeChanged() {
       OnToStringChanged();
     }
@@ -103 +103 @@
     public override string ToString() {
       if (Threshold == null) return Name;
-      else return string.Format("{0} {1} {2}", Name, Comparison.ToSymbol(), ThresholdParameter.Value);
+      else return string.Format("{0} {1} {2}", Name, ComparisonType.ToSymbol(), ThresholdParameter.Value);
     }
   }