Changeset 176

Timestamp:

04/24/08 12:45:26 (17 years ago)

Author:

abeham

Message:

Merged fixes of #124 and #129 from trunk to release branch

Location:

branches/3.0/sources/HeuristicLab.Constraints

Files:

• VariableComparisonConstraint.cs (modified) (2 diffs)
• VariableComparisonConstraintView.Designer.cs (modified) (4 diffs)

branches/3.0/sources/HeuristicLab.Constraints/VariableComparisonConstraint.cs

@@ -49 +49 @@
     public override string Description {
       get {
-        return @"Compares items in a ConstrainedItemList";
+        return @"Compares variables in a ConstrainedItemList";
       }
     }
@@ -70 +70 @@
           if (left == null) throw new InvalidCastException("ERROR in VariableComparisonConstraint: Value of the variable on the left side needs to be of type IComparable");
         } else if (tmp != null && tmp.Name.Equals(rightVarName.Data)) {
-          right = tmp;
+          right = tmp.Value;
         }
       }

branches/3.0/sources/HeuristicLab.Constraints/VariableComparisonConstraintView.Designer.cs

@@ -77 +77 @@
       this.comparerGroupBox.Name = "comparerGroupBox";
       this.comparerGroupBox.Size = new System.Drawing.Size(141, 137);
-      this.comparerGroupBox.TabIndex = 1;
+      this.comparerGroupBox.TabIndex = 4;
       this.comparerGroupBox.TabStop = false;
       this.comparerGroupBox.Text = "Comparer";
@@ -142 +142 @@
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(32, 13);
-      this.label2.TabIndex = 4;
+      this.label2.TabIndex = 2;
       this.label2.Text = "Right";
       // 
@@ -152 +152 @@
       this.rightVarNameStringDataView.Size = new System.Drawing.Size(100, 20);
       this.rightVarNameStringDataView.StringData = null;
-      this.rightVarNameStringDataView.TabIndex = 5;
+      this.rightVarNameStringDataView.TabIndex = 3;
       // 
       // leftVarNameStringDataView
@@ -161 +161 @@
       this.leftVarNameStringDataView.Size = new System.Drawing.Size(100, 20);
       this.leftVarNameStringDataView.StringData = null;
-      this.leftVarNameStringDataView.TabIndex = 6;
+      this.leftVarNameStringDataView.TabIndex = 1;
       // 
       // VariableComparisonConstraintView