Changeset 15309 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

Timestamp:

08/07/17 09:43:58 (7 years ago)

Author:

pfleck

Message:

#2809 Worked on type-save PreprocessingDataColumns.

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs (modified) (4 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

@@ -38 +38 @@
     private IPreprocessingData filteredData;
 
+    public IList<PreprocessingDataColumn> DataColumns {
+      get { return ActiveData.DataColumns; }
+    }
+
     public IPreprocessingData ActiveData {
       get { return IsFiltered ? filteredData : originalData; }
@@ -82 +86 @@
     }
 
-    public IList<T> GetValues<T>(int columnIndex, bool considerSelection) {
+    public IEnumerable<T> GetValues<T>(int columnIndex, bool considerSelection) {
       return ActiveData.GetValues<T>(columnIndex, considerSelection);
     }
 
-    public void SetValues<T>(int columnIndex, IList<T> values) {
+    public void SetValues<T>(int columnIndex, IEnumerable<T> values) {
       if (IsFiltered)
         throw new InvalidOperationException("SetValues not possible while data is filtered");
@@ -123 +127 @@
     }
 
-    public void DeleteRowsWithIndices(IEnumerable<int> rows) {
+    public void DeleteRows(IEnumerable<int> rows) {
       if (IsFiltered)
         throw new InvalidOperationException("DeleteRowsWithIndices not possible while data is filtered");
 
-      originalData.DeleteRowsWithIndices(rows);
+      originalData.DeleteRows(rows);
     }
 
@@ -273 +277 @@
     public void EndTransaction() {
       originalData.EndTransaction();
-    }
-    #endregion
-
-    #region Statistics
-    public T GetMin<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMin<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMax<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMax<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMean<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMean<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMedian<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IComparable<T> {
-      return ActiveData.GetMean<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMode<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IEquatable<T> {
-      return ActiveData.GetMode<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetStandardDeviation<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetStandardDeviation<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetVariance<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetVariance<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetQuantile<T>(double alpha, int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IComparable<T> {
-      return ActiveData.GetQuantile<T>(alpha, columnIndex, considerSelection, emptyValue);
-    }
-    public int GetDistinctValues<T>(int columnIndex, bool considerSelection = false) {
-      return ActiveData.GetDistinctValues<T>(columnIndex, considerSelection);
-    }
-
-    public int GetMissingValueCount() {
-      return ActiveData.GetMissingValueCount();
-    }
-    public int GetMissingValueCount(int columnIndex) {
-      return ActiveData.GetMissingValueCount(columnIndex);
-    }
-    public int GetRowMissingValueCount(int rowIndex) {
-      return ActiveData.GetRowMissingValueCount(rowIndex);
     }
     #endregion