Changeset 15431 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

Timestamp:

10/25/17 12:38:12 (6 years ago)

Author:

pfleck

Message:

#2809: Removed experimental static-typed datacolumns. (reverse merge g15291, r15309)

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs (modified) (4 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

@@ -57 +57 @@
 
       for (int i = 0; i < PreprocessingData.Rows; ++i) {
-        int missingCount = 0;
-        for (var col = 0; col < PreprocessingData.DataColumns.Count; col++) {
-          if (!PreprocessingData.DataColumns[col].IsValidValue(i))
-            missingCount++;
+        int missingCount = PreprocessingData.GetRowMissingValueCount(i);
+        if (100f / PreprocessingData.Columns * missingCount > percent) {
+          rows.Add(i);
         }
-        if (100f / PreprocessingData.Columns * missingCount > percent)
-          rows.Add(i);
       }
 
@@ -72 +69 @@
       List<int> columns = new List<int>();
       for (int i = 0; i < PreprocessingData.Columns; ++i) {
-        int missingCount = PreprocessingData.DataColumns[i].GetNumberOfMissingValues();
+        int missingCount = PreprocessingData.GetMissingValueCount(i);
         if (100f / PreprocessingData.Rows * missingCount > percent) {
           columns.Add(i);
@@ -83 +80 @@
     public List<int> ColumnsWithVarianceSmaller(double variance) {
       List<int> columns = new List<int>();
-
-      for (int i = 0; i < PreprocessingData.Columns; i++) {
-        if (PreprocessingData.DataColumns[i].TypeSwitch<bool>(
-          c => c.GetVariance() < variance,
-          c => false,
-          c => c.GetVariance().Ticks / TimeSpan.TicksPerSecond < variance
-        ))
-          columns.Add(i);
+      for (int i = 0; i < PreprocessingData.Columns; ++i) {
+        if (PreprocessingData.VariableHasType<double>(i)) {
+          double columnVariance = PreprocessingData.GetVariance<double>(i);
+          if (columnVariance < variance) {
+            columns.Add(i);
+          }
+        } else if (PreprocessingData.VariableHasType<DateTime>(i)) {
+          double columnVariance = (double)PreprocessingData.GetVariance<DateTime>(i).Ticks / TimeSpan.TicksPerSecond;
+          if (columnVariance < variance) {
+            columns.Add(i);
+          }
+        }
       }
-
       return columns;
     }
@@ -119 +119 @@
       PreprocessingData.InTransaction(() => {
         foreach (int column in columns.OrderByDescending(x => x)) {
-          PreprocessingData.DataColumns.RemoveAt(column);
+          PreprocessingData.DeleteColumn(column);
         }
       });