Changeset 3717 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

Timestamp:

05/08/10 04:36:13 (14 years ago)

Author:

mkommend

Message:

sorting of column names in RunCollection and fixed errors in RunCollectionConstraints (ticket #970)

File:

• trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs

@@ -61 +61 @@
 
     [Storable]
-    private int constraintColumn;
-    public int ConstraintColumn {
+    private string constraintColumn;
+    public string ConstraintColumn {
       get { return constraintColumn; }
       set {
-        if (value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())
+        if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value))
           throw new ArgumentException("Could not set ConstraintData to not existing column index.");
         if (constraintColumn != value) {
@@ -80 +80 @@
       if (handler != null)
         handler(this, EventArgs.Empty);
+    }
+
+    protected override void OnConstrainedValueChanged() {
+      base.OnConstrainedValueChanged();
+      IStringConvertibleMatrix matrix = (IStringConvertibleMatrix)ConstrainedValue;
+      if (constraintColumn == null && ConstrainedValue != null && matrix.Columns != 0)
+        constraintColumn = matrix.ColumnNames.ElementAt(0);
     }
 
@@ -111 +118 @@
       IStringConvertibleMatrix matrix = ConstrainedValue;
       if (matrix != null && matrix.ColumnNames.Count() != 0)
-        s += matrix.ColumnNames.ElementAt(constraintColumn) + " ";
+        s += constraintColumn + " ";
       else
         return "ComparisonConstraint";