Changeset 13881

Timestamp:

06/08/16 15:21:31 (8 years ago)

Author:

mkommend

Message:

#2536: Merged r13427 and r13539 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Implementations/PreprocessingData.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis/3.4/Dataset.cs (modified) (2 diffs)

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

@@ -134 +134 @@
     }
 
-    private static IList CreateColumn<T>(Dataset ds, int column, Func<string, T> selector) {
-      var list = new List<T>(ds.Rows);
-      for (int row = 0; row < ds.Rows; ++row) {
-        list.Add(selector(ds.GetValue(row, column)));
-      }
-      return list;
-    }
-
     private void CheckPartitionRanges() {
       int maxRowIndex = Math.Max(0, Rows - 1);

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

@@ -201 +201 @@
     public int Rows {
       get { return rows; }
-      set { throw new NotSupportedException(); }
-    }
+    }
+    int IStringConvertibleMatrix.Rows {
+      get { return Rows; }
+      set { throw new NotSupportedException(); }
+    }
+
     public int Columns {
       get { return variableNames.Count; }
-      set { throw new NotSupportedException(); }
-    }
-    public bool SortableView {
+    }
+    int IStringConvertibleMatrix.Columns {
+      get { return Columns; }
+      set { throw new NotSupportedException(); }
+    }
+    bool IStringConvertibleMatrix.SortableView {
       get { return false; }
       set { throw new NotSupportedException(); }
     }
-    public bool ReadOnly {
+    bool IStringConvertibleMatrix.ReadOnly {
       get { return true; }
     }
@@ -222 +229 @@
       set { throw new NotSupportedException(); }
     }
-    public string GetValue(int rowIndex, int columnIndex) {
+    string IStringConvertibleMatrix.GetValue(int rowIndex, int columnIndex) {
       return variableValues[variableNames[columnIndex]][rowIndex].ToString();
     }