Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs

    r3617 r3717  
    5858
    5959    [Storable]
    60     private int constraintColumn;
    61     public int ConstraintColumn {
     60    private string constraintColumn;
     61    public string ConstraintColumn {
    6262      get { return constraintColumn; }
    6363      set {
    64         if (value < 0 || value >= ((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Count())
     64        if (!((IStringConvertibleMatrix)ConstrainedValue).ColumnNames.Contains(value))
    6565          throw new ArgumentException("Could not set ConstraintData to not existing column index.");
    6666        if (constraintColumn != value) {
     
    7777      if (handler != null)
    7878        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);
    7986    }
    8087
     
    108115      IStringConvertibleMatrix matrix = ConstrainedValue;
    109116      if (matrix != null && matrix.ColumnNames.Count() != 0)
    110         s += matrix.ColumnNames.ElementAt(constraintColumn) + " ";
     117        s += constraintColumn + " ";
    111118      else
    112119        return "EqualityConstraint";
Note: See TracChangeset for help on using the changeset viewer.