Changeset 13881


Ignore:
Timestamp:
06/08/16 15:21:31 (5 years ago)
Author:
mkommend
Message:

#2536: Merged r13427 and r13539 into stable.

Location:
stable
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.DataPreprocessing/3.4

  • stable/HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs

    r13289 r13881  
    134134    }
    135135
    136     private static IList CreateColumn<T>(Dataset ds, int column, Func<string, T> selector) {
    137       var list = new List<T>(ds.Rows);
    138       for (int row = 0; row < ds.Rows; ++row) {
    139         list.Add(selector(ds.GetValue(row, column)));
    140       }
    141       return list;
    142     }
    143 
    144136    private void CheckPartitionRanges() {
    145137      int maxRowIndex = Math.Max(0, Rows - 1);
  • stable/HeuristicLab.Problems.DataAnalysis

  • stable/HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs

    r12702 r13881  
    201201    public int Rows {
    202202      get { return rows; }
    203       set { throw new NotSupportedException(); }
    204     }
     203    }
     204    int IStringConvertibleMatrix.Rows {
     205      get { return Rows; }
     206      set { throw new NotSupportedException(); }
     207    }
     208
    205209    public int Columns {
    206210      get { return variableNames.Count; }
    207       set { throw new NotSupportedException(); }
    208     }
    209     public bool SortableView {
     211    }
     212    int IStringConvertibleMatrix.Columns {
     213      get { return Columns; }
     214      set { throw new NotSupportedException(); }
     215    }
     216    bool IStringConvertibleMatrix.SortableView {
    210217      get { return false; }
    211218      set { throw new NotSupportedException(); }
    212219    }
    213     public bool ReadOnly {
     220    bool IStringConvertibleMatrix.ReadOnly {
    214221      get { return true; }
    215222    }
     
    222229      set { throw new NotSupportedException(); }
    223230    }
    224     public string GetValue(int rowIndex, int columnIndex) {
     231    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
    225232      return variableValues[variableNames[columnIndex]][rowIndex].ToString();
    226233    }
Note: See TracChangeset for help on using the changeset viewer.