Changeset 10537 for branches

Timestamp:

03/05/14 14:11:06 (11 years ago)

Author:

rstoll

Message:

• Delete samples without sufficient information or variance implemented in TransformationLogic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/StatisticsLogic.cs (modified) (1 diff)
• Implementations/TransformationLogic.cs (modified) (1 diff)
• Interfaces/ITransformationLogic.cs (modified) (1 diff)
• Views/DataPreprocessingView.cs (modified) (1 diff)

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

@@ -97 +97 @@
 
       return preprocessingData.GetValues<T>(columnIndex)
-
                               .GroupBy(x => x)
                               .OrderByDescending(g => g.Count())

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

@@ -1 +1 @@
 
+using System;
 namespace HeuristicLab.DataPreprocessing {
+
   public class TransformationLogic : ITransformationLogic {
+
+    private readonly IPreprocessingData preprocessingData;
+    private readonly ISearchLogic searchLogic;
+    private readonly IStatisticsLogic statisticsLogic;
+
+    public TransformationLogic(IPreprocessingData thePreprocessingData, ISearchLogic theSearchLogic, IStatisticsLogic theStatisticsLogic) {
+      preprocessingData = thePreprocessingData;
+      searchLogic = theSearchLogic;
+      statisticsLogic = theStatisticsLogic;
+    }
+
+    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/ITransformationLogic.cs

@@ -1 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace HeuristicLab.DataPreprocessing
-{
-  public interface ITransformationLogic
-  {
+
+namespace HeuristicLab.DataPreprocessing {
+  public interface ITransformationLogic {
+    void deleteRowsWithMissingValuesGreater(double percent);
+    void deleteColumnsWithMissingValuesGreater(float percent);
+    void deleteColumnsWithVarianceSmaller(double variance);
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs

@@ -46 +46 @@
       ISearchLogic searchLogic = new SearchLogic(data);
       var dataGridLogic = new DataGridLogic(data);
-      dataGridContent = new DataGridContent(dataGridLogic, new ManipulationLogic(data, searchLogic, new StatisticsLogic(data, searchLogic)));
-      statisticsContent = new StatisticsContent(new StatisticsLogic(data, searchLogic));
+      StatisticsLogic statisticsLogic = new StatisticsLogic(data, searchLogic);
+      dataGridContent = new DataGridContent(dataGridLogic, new ManipulationLogic(data, searchLogic, statisticsLogic));
+      statisticsContent = new StatisticsContent(statisticsLogic);
       filterContent = new FilterContent(new FilterLogic());
-      tranformationContent = new TransformationContent(new TransformationLogic());
+      tranformationContent = new TransformationContent(new TransformationLogic(data, searchLogic, statisticsLogic));
       lineChartContent = new LineChartContent(new LineChartLogic(data));
       histogramContent = new HistogramContent(new HistogramLogic());