Changeset 14076 for stable/HeuristicLab.DataPreprocessing

Timestamp:

07/14/16 22:39:50 (8 years ago)

Author:

mkommend

Message:

#2393: Merged r13838 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Logic/SearchLogic.cs (modified) (2 diffs)

stable/HeuristicLab.DataPreprocessing/3.4/Logic/SearchLogic.cs

@@ -93 +93 @@
     }
 
+    public IList<int> GetMissingValueIndices(int columnIndex) {
+      int index = 0;
+      var indices = new List<int>();
+
+      if (MissingValueIndicies.ContainsKey(columnIndex)) {
+        return MissingValueIndicies[columnIndex];
+      }
+
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
+        foreach (var v in preprocessingData.GetValues<double>(columnIndex)) {
+          if (double.IsNaN(v)) indices.Add(index);
+          index++;
+        }
+      } else if (preprocessingData.VariableHasType<string>(columnIndex)) {
+        foreach (var v in preprocessingData.GetValues<string>(columnIndex)) {
+          if (string.IsNullOrEmpty(v)) indices.Add(index);
+          index++;
+        }
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        foreach (var v in preprocessingData.GetValues<DateTime>(columnIndex)) {
+          if (DateTime.MinValue.Equals(v)) indices.Add(index);
+          index++;
+        }
+      } else {
+        throw new ArgumentException("column " + columnIndex + " contains a non supported type.");
+      }
+
+      MissingValueIndicies[columnIndex] = indices;
+      return MissingValueIndicies[columnIndex];
+    }
+
+
     public bool IsMissingValue(int columnIndex, int rowIndex) {
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
@@ -103 +135 @@
         throw new ArgumentException("cell in column " + columnIndex + " and row index " + rowIndex + " contains a non supported type.");
       }
-    }
-
-    public IList<int> GetMissingValueIndices(int columnIndex) {
-      if (!MissingValueIndicies.ContainsKey(columnIndex)) {
-        if (preprocessingData.VariableHasType<double>(columnIndex)) {
-          MissingValueIndicies[columnIndex] = GetMissingValueIndices<double>(columnIndex);
-        } else if (preprocessingData.VariableHasType<string>(columnIndex)) {
-          MissingValueIndicies[columnIndex] = GetMissingValueIndices<string>(columnIndex);
-        } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
-          MissingValueIndicies[columnIndex] = GetMissingValueIndices<DateTime>(columnIndex);
-        } else {
-          throw new ArgumentException("column " + columnIndex + " contains a non supported type.");
-        }
-      }
-      return MissingValueIndicies[columnIndex];
-    }
-
-    private IList<int> GetMissingValueIndices<T>(int columnIndex) {
-      List<int> missingIndices = new List<int>();
-
-      for (int row = 0; row < preprocessingData.Rows; ++row) {
-        if (IsMissingValue(columnIndex, row)) {
-          missingIndices.Add(row);
-        }
-      }
-
-      return missingIndices;
     }