Changeset 10711

Timestamp:

04/02/14 14:50:03 (11 years ago)

Author:

rstoll

Message:

Moved methods for "delete columns/rows without sufficient information" from ITransformationLogic to IManipulationLogic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/ManipulationLogic.cs (modified) (1 diff)
• Implementations/TransformationLogic.cs (modified) (2 diffs)
• Interfaces/IManipulationLogic.cs (modified) (1 diff)
• Interfaces/ITransformationLogic.cs (modified) (1 diff)

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

@@ -255 +255 @@
       });
     }
+
+
+    public void DeleteRowsWithMissingValuesGreater(double percent) {
+      for (int i = 0; i < preprocessingData.Rows; ++i) {
+        int missingCount = statisticsLogic.GetRowMissingValueCount(i);
+        if (100f / preprocessingData.Columns * missingCount >= percent) {
+          preprocessingData.DeleteRow(i);
+          --i;
+        }
+      }
+    }
+
+    public void DeleteColumnsWithMissingValuesGreater(float percent) {
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
+        int missingCount = statisticsLogic.GetMissingValueCount(i);
+        if (100f / preprocessingData.Columns * missingCount >= percent) {
+          preprocessingData.DeleteColumn(i);
+          --i;
+        }
+      }
+    }
+
+    public void DeleteColumnsWithVarianceSmaller(double variance) {
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
+        if (preprocessingData.IsType<double>(i) || preprocessingData.IsType<DateTime>(i)) {
+          double columnVariance = statisticsLogic.GetVariance(i);
+          if (columnVariance < variance) {
+            preprocessingData.DeleteColumn(i);
+            --i;
+          }
+        }
+      }
+    }
+
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using System;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -36 +35 @@
     }
 
-    public void DeleteRowsWithMissingValuesGreater(double percent) {
-      for (int i = 0; i < preprocessingData.Rows; ++i) {
-        int missingCount = statisticsLogic.GetRowMissingValueCount(i);
-        if (100f / preprocessingData.Columns * missingCount >= percent) {
-          preprocessingData.DeleteRow(i);
-          --i;
-        }
-      }
-    }
-
-    public void DeleteColumnsWithMissingValuesGreater(float percent) {
-      for (int i = 0; i < preprocessingData.Columns; ++i) {
-        int missingCount = statisticsLogic.GetMissingValueCount(i);
-        if (100f / preprocessingData.Columns * missingCount >= percent) {
-          preprocessingData.DeleteColumn(i);
-          --i;
-        }
-      }
-    }
-
-    public void DeleteColumnsWithVarianceSmaller(double variance) {
-      for (int i = 0; i < preprocessingData.Columns; ++i) {
-        if (preprocessingData.IsType<double>(i) || preprocessingData.IsType<DateTime>(i)) {
-          double columnVariance = statisticsLogic.GetVariance(i);
-          if (columnVariance < variance) {
-            preprocessingData.DeleteColumn(i);
-            --i;
-          }
-        }
-      }
-    }
-
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IManipulationLogic.cs

@@ -36 +36 @@
     void ShuffleWithRanges();
     void ShuffleWithRanges(IEnumerable<HeuristicLab.Data.IntRange> ranges);
+    void DeleteRowsWithMissingValuesGreater(double percent);
+    void DeleteColumnsWithMissingValuesGreater(float percent);
+    void DeleteColumnsWithVarianceSmaller(double variance);
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/ITransformationLogic.cs

@@ -22 +22 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface ITransformationLogic {
-    void DeleteRowsWithMissingValuesGreater(double percent);
-    void DeleteColumnsWithMissingValuesGreater(float percent);
-    void DeleteColumnsWithVarianceSmaller(double variance);
+
   }
 }