Changeset 3630


Ignore:
Timestamp:
05/05/10 13:31:55 (12 years ago)
Author:
mkommend
Message:

renamed ConstraintOperations (ticket #996)

Location:
trunk/sources/HeuristicLab.Core/3.3/Constraints
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs

    r3613 r3630  
    4444
    4545    public override IEnumerable<ConstraintOperation> AllowedConstraintOperations {
    46       get { return new ConstraintOperation[6] { ConstraintOperation.Lesser, ConstraintOperation.LesserOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
     46      get { return new ConstraintOperation[6] { ConstraintOperation.Less, ConstraintOperation.LessOrEqual, ConstraintOperation.Equal, ConstraintOperation.GreaterOrEqual, ConstraintOperation.Greater, ConstraintOperation.NotEqual }; }
    4747    }
    4848
     
    5757      int compareResult = comparableMember.CompareTo(this.ConstraintData);
    5858      bool result = false;
    59       if (this.ConstraintOperation == ConstraintOperation.Lesser)
     59      if (this.ConstraintOperation == ConstraintOperation.Less)
    6060        result = compareResult < 0;
    61       else if (this.ConstraintOperation == ConstraintOperation.LesserOrEqual)
     61      else if (this.ConstraintOperation == ConstraintOperation.LessOrEqual)
    6262        result = compareResult <= 0;
    6363      else if (this.ConstraintOperation == ConstraintOperation.Equal)
  • trunk/sources/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs

    r3603 r3630  
    2727    public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");
    2828    public static readonly ConstraintOperation NotEqual = new ConstraintOperation(1, "Not equal");
    29     public static readonly ConstraintOperation Lesser = new ConstraintOperation(2, "Lesser");
    30     public static readonly ConstraintOperation LesserOrEqual = new ConstraintOperation(3, "Lesser or equal");
    31     public static readonly ConstraintOperation Greater = new ConstraintOperation(4, "Greater");
    32     public static readonly ConstraintOperation GreaterOrEqual = new ConstraintOperation(5, "Greater or equal");
     29    public static readonly ConstraintOperation Less = new ConstraintOperation(2, "Less than");
     30    public static readonly ConstraintOperation LessOrEqual = new ConstraintOperation(3, "Less than or equal");
     31    public static readonly ConstraintOperation Greater = new ConstraintOperation(4, "Greater than");
     32    public static readonly ConstraintOperation GreaterOrEqual = new ConstraintOperation(5, "Greater than or equal");
    3333    public static readonly ConstraintOperation IsTypeCompatible = new ConstraintOperation(6, "Is type compatible to");
    3434    public static readonly ConstraintOperation IsTypeNotCompatible = new ConstraintOperation(7, "Is type not compatible to");
Note: See TracChangeset for help on using the changeset viewer.