Changeset 3717 for trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs
- Timestamp:
- 05/08/10 04:36:13 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs
r3617 r3717 58 58 59 59 [Storable] 60 private intconstraintColumn;61 public intConstraintColumn {60 private string constraintColumn; 61 public string ConstraintColumn { 62 62 get { return constraintColumn; } 63 63 set { 64 if ( value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())64 if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value)) 65 65 throw new ArgumentException("Could not set ConstraintData to not existing column index."); 66 66 if (constraintColumn != value) { … … 77 77 if (handler != null) 78 78 handler(this, EventArgs.Empty); 79 } 80 81 protected override void OnConstrainedValueChanged() { 82 base.OnConstrainedValueChanged(); 83 IStringConvertibleMatrix matrix = (IStringConvertibleMatrix)ConstrainedValue; 84 if (constraintColumn == null && ConstrainedValue != null && matrix.Columns != 0) 85 constraintColumn = matrix.ColumnNames.ElementAt(0); 79 86 } 80 87 … … 108 115 IStringConvertibleMatrix matrix = ConstrainedValue; 109 116 if (matrix != null && matrix.ColumnNames.Count() != 0) 110 s += matrix.ColumnNames.ElementAt(constraintColumn)+ " ";117 s += constraintColumn + " "; 111 118 else 112 119 return "EqualityConstraint";
Note: See TracChangeset
for help on using the changeset viewer.