Changeset 3630

Timestamp:

05/05/10 13:31:55 (14 years ago)

Author:

mkommend

Message:

renamed ConstraintOperations (ticket #996)

Location:

trunk/sources/HeuristicLab.Core/3.3/Constraints

Files:

• ComparisonConstraint.cs (modified) (2 diffs)
• ConstraintOperation.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

@@ -44 +44 @@
 
     public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
-      get { return new ConstraintOperation[6] { ConstraintOperation.Lesser, ConstraintOperation.LesserOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
+      get { return new ConstraintOperation[6] { ConstraintOperation.Less, ConstraintOperation.LessOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
     }
 
@@ -57 +57 @@
       int compareResult = comparableMember.CompareTo(this.ConstraintData);
       bool result = false;
-      if (this.ConstraintOperation == ConstraintOperation.Lesser)
+      if (this.ConstraintOperation == ConstraintOperation.Less)
         result = compareResult < 0;
-      else if (this.ConstraintOperation == ConstraintOperation.LesserOrEqual)
+      else if (this.ConstraintOperation == ConstraintOperation.LessOrEqual)
         result = compareResult <= 0;
       else if (this.ConstraintOperation == ConstraintOperation.Equal)

trunk/sources/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

@@ -27 +27 @@
     public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");
     public static readonly ConstraintOperation NotEqual = new ConstraintOperation(1, "Not equal");
-    public static readonly ConstraintOperation Lesser = new ConstraintOperation(2, "Lesser");
-    public static readonly ConstraintOperation LesserOrEqual = new ConstraintOperation(3, "Lesser or equal");
-    public static readonly ConstraintOperation Greater = new ConstraintOperation(4, "Greater");
-    public static readonly ConstraintOperation GreaterOrEqual = new ConstraintOperation(5, "Greater or equal");
+    public static readonly ConstraintOperation Less = new ConstraintOperation(2, "Less than");
+    public static readonly ConstraintOperation LessOrEqual = new ConstraintOperation(3, "Less than or equal");
+    public static readonly ConstraintOperation Greater = new ConstraintOperation(4, "Greater than");
+    public static readonly ConstraintOperation GreaterOrEqual = new ConstraintOperation(5, "Greater than or equal");
     public static readonly ConstraintOperation IsTypeCompatible = new ConstraintOperation(6, "Is type compatible to");
     public static readonly ConstraintOperation IsTypeNotCompatible = new ConstraintOperation(7, "Is type not compatible to");