Changeset 10737 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Timestamp:

04/09/14 13:08:49 (11 years ago)

Author:

rstoll

Message:

• Preview and execution for delete columns/rows with insufficient information

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• ManipulationLogic.cs (modified) (6 diffs)
• SearchLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/ManipulationLogic.cs

@@ -299 +299 @@
       List<int> rows= new List<int>();
 
-      for (int i = preprocessingData.Rows - 1; i >= 0; --i)
+      for (int i = 0; i < preprocessingData.Rows; ++i)
       {
         int missingCount = statisticsLogic.GetRowMissingValueCount(i);
-        if (100f / preprocessingData.Columns * missingCount >= percent)
+        if (100f / preprocessingData.Columns * missingCount > percent)
         {
           rows.Add(i);
@@ -314 +314 @@
 
       List<int> columns = new List<int>();
-      for (int i = preprocessingData.Columns - 1; i >= 0; --i)
-      {
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
         int missingCount = statisticsLogic.GetMissingValueCount(i);
-        if (100f / preprocessingData.Columns * missingCount >= percent)
-        {
+        if (100f / preprocessingData.Rows * missingCount > percent) {
           columns.Add(i);
         }
@@ -329 +327 @@
 
       List<int> columns = new List<int>();
-      for (int i = preprocessingData.Columns - 1; i >= 0; --i)
-      {
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
         if (preprocessingData.IsType<double>(i) || preprocessingData.IsType<DateTime>(i))
         {
@@ -355 +352 @@
     }
 
-    private void DeleteRows(IEnumerable<int> rows) {
+    private void DeleteRows(List<int> rows) {
+      rows.Sort();
+      rows.Reverse();
       preprocessingData.InTransaction(() =>
       {
@@ -365 +364 @@
     }
 
-    private void DeleteColumns(IEnumerable<int> columns) {
+    private void DeleteColumns(List<int> columns) {
+      columns.Sort();
+      columns.Reverse();
       preprocessingData.InTransaction(() =>
       {
@@ -373 +374 @@
         }
       });
+    }
+
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { dataGridLogic.Changed += value; }
+      remove { dataGridLogic.Changed -= value; }
     }
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/SearchLogic.cs

@@ -43 +43 @@
     void preprocessingData_Changed(object sender, DataPreprocessingChangedEventArgs e)
     {
-      MissingValueIndicies.Remove(e.Column);
-      ValuesWithoutNaN.Remove(e.Column);
+      switch (e.Type) {
+        case DataPreprocessingChangedEventType.DeleteColumn:
+        case DataPreprocessingChangedEventType.ChangeColumn:
+          MissingValueIndicies.Remove(e.Column);
+          ValuesWithoutNaN.Remove(e.Column);
+          break;
+        case DataPreprocessingChangedEventType.AddColumn:
+          //cache does not need to be updated, will be calculated the first time it is requested
+          break;
+        case DataPreprocessingChangedEventType.DeleteRow:
+        case DataPreprocessingChangedEventType.AddRow:
+        case DataPreprocessingChangedEventType.ChangeItem:
+        case DataPreprocessingChangedEventType.Any:
+        case DataPreprocessingChangedEventType.Transformation:
+          MissingValueIndicies = new Dictionary<int, IEnumerable<int>>();
+          ValuesWithoutNaN = new Dictionary<int, IEnumerable>();
+          break;
+      } 
     }