Changeset 3605 for trunk/sources

Timestamp:

05/04/10 14:52:20 (15 years ago)

Author:

mkommend

Message:

corrected ctors of core constraints (ticket #996)

Location:

trunk/sources/HeuristicLab.Core/3.3/Constraints

Files:

• Constraint.cs (modified) (1 diff)
• EqualityConstraint.cs (modified) (1 diff)
• TypeCompatibilityConstraint.cs (modified) (1 diff)

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

@@ -36 +36 @@
     protected Constraint(bool deserializing) {
     }
-    protected Constraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue)
+    protected Constraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData)
       : this() {
       this.ConstrainedValue = constrainedValue;
-      this.ConstraintOperation = comparisonOperation;
-      this.ConstraintData = comparisonValue;
+      this.ConstraintOperation = constraintOperation;
+      this.ConstraintData = constraintData;
     }
-    protected Constraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue, bool active) {
+    protected Constraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData, bool active) {
       this.ConstrainedValue = constrainedValue;
-      this.ConstraintOperation = comparisonOperation;
-      this.ConstraintData = comparisonValue;
+      this.ConstraintOperation = constraintOperation;
+      this.ConstraintData = constraintData;
       this.Active = active;
     }

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

@@ -37 +37 @@
     protected EqualityConstraint(bool deserializing) {
     }
-    public EqualityConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue)
-      : base(constrainedValue, comparisonOperation, comparisonValue) {
+    public EqualityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData)
+      : base(constrainedValue, constraintOperation, constraintData) {
     }
-    public EqualityConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue, bool active)
-      : base(constrainedValue, comparisonOperation, comparisonOperation, active) {
+    public EqualityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, object constraintData, bool active)
+      : base(constrainedValue, constraintOperation, constraintData, active) {
     }
 

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

@@ -36 +36 @@
       : base() {
     }
-    public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, Type comparisonValue)
-      : base(constrainedValue, comparisonOperation, comparisonValue) {
+    public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, Type constraintData)
+      : base(constrainedValue, constraintOperation, constraintData) {
     }
-    public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation comparisonOperation, object comparisonValue, bool active)
-      : base(constrainedValue, comparisonOperation, comparisonOperation, active) {
+    public TypeCompatibilityConstraint(IItem constrainedValue, ConstraintOperation constraintOperation, Type constraintData, bool active)
+      : base(constrainedValue, constraintOperation, constraintData, active) {
     }