Changeset 10809 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsLogic.cs

Timestamp:

05/07/14 12:47:54 (10 years ago)

Author:

sbreuer

Message:

• selected average and co. implemented
• SelectionChanged NullPointer fixed

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsLogic.cs (modified) (5 diffs)

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

@@ -73 +73 @@
     }
 
-    public T GetMin<T>(int columnIndex) where T : IComparable<T> {
-      return preprocessingData.GetValues<T>(columnIndex).Min();
+    public T GetMin<T>(int columnIndex, bool considerSelection) where T : IComparable<T> {
+      return preprocessingData.GetValues<T>(columnIndex, considerSelection).Min();
     }
 
-    public T GetMax<T>(int columnIndex) where T : IComparable<T> {
-      return preprocessingData.GetValues<T>(columnIndex).Max();
+    public T GetMax<T>(int columnIndex, bool considerSelection) where T : IComparable<T> {
+      return preprocessingData.GetValues<T>(columnIndex, considerSelection).Max();
     }
 
-    public double GetMedian(int columnIndex) {
+    public double GetMedian(int columnIndex, bool considerSelection) {
       double median = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        median = GetValuesWithoutNaN<double>(columnIndex).Median();
+        median = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Median();
       }
       return median;
     }
 
-    public double GetAverage(int columnIndex) {
+    public double GetAverage(int columnIndex, bool considerSelection) {
       double avg = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        avg = GetValuesWithoutNaN<double>(columnIndex).Average();
+        avg = GetValuesWithoutNaN<double>(columnIndex, considerSelection).Average();
       }
       return avg;
     }
 
-    public DateTime GetMedianDateTime(int columnIndex) {
+    public DateTime GetMedianDateTime(int columnIndex, bool considerSelection) {
       DateTime median = new DateTime();
       if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        median = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex).Median());
+        median = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Median());
       }
       return median;
     }
 
-    public DateTime GetAverageDateTime(int columnIndex) {
+    public DateTime GetAverageDateTime(int columnIndex, bool considerSelection) {
       DateTime avg = new DateTime();
       if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        avg = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex).Average());
+        avg = GetSecondsAsDateTime(GetDateTimeAsSeconds(columnIndex, considerSelection).Average());
       }
       return avg;
     }
 
-    public T GetMostCommonValue<T>(int columnIndex) {
-      var t = preprocessingData.GetValues<T>(columnIndex);
+    public T GetMostCommonValue<T>(int columnIndex, bool considerSelection) {
+      var t = preprocessingData.GetValues<T>(columnIndex, considerSelection);
       var t2 = t.GroupBy(x => x);
       var t3 = t2.Select(g => g.Key);
 
-      return preprocessingData.GetValues<T>(columnIndex)
+      return preprocessingData.GetValues<T>(columnIndex, considerSelection)
                               .GroupBy(x => x)
                               .OrderByDescending(g => g.Count())
@@ -129 +129 @@
       double stdDev = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        stdDev = GetValuesWithoutNaN<double>(columnIndex).StandardDeviation();
+        stdDev = GetValuesWithoutNaN<double>(columnIndex, false).StandardDeviation();
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        stdDev = GetDateTimeAsSeconds(columnIndex).StandardDeviation();
+        stdDev = GetDateTimeAsSeconds(columnIndex, false).StandardDeviation();
       }
       return stdDev;
@@ -139 +139 @@
       double variance = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        variance = preprocessingData.GetValues<double>(columnIndex).Variance();
+        variance = preprocessingData.GetValues<double>(columnIndex, false).Variance();
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        variance = GetDateTimeAsSeconds(columnIndex).Variance();
+        variance = GetDateTimeAsSeconds(columnIndex, false).Variance();
       }
       return variance;
@@ -147 +147 @@
 
     public int GetDifferentValuesCount<T>(int columnIndex) {
-      return preprocessingData.GetValues<T>(columnIndex).GroupBy(x => x).Count();
+      return preprocessingData.GetValues<T>(columnIndex, false).GroupBy(x => x).Count();
     }
 
@@ -179 +179 @@
     }
 
-    private IEnumerable<double> GetDateTimeAsSeconds(int columnIndex) {
-      return GetValuesWithoutNaN<DateTime>(columnIndex).Select(x => (double)x.Ticks / TimeSpan.TicksPerSecond);
+    private IEnumerable<double> GetDateTimeAsSeconds(int columnIndex, bool considerSelection) {
+      return GetValuesWithoutNaN<DateTime>(columnIndex, considerSelection).Select(x => (double)x.Ticks / TimeSpan.TicksPerSecond);
     }
 
-    private IEnumerable<T> GetValuesWithoutNaN<T>(int columnIndex) {
-      return searchLogic.GetValuesWithoutNaN<T>(columnIndex);
+    private IEnumerable<T> GetValuesWithoutNaN<T>(int columnIndex, bool considerSelection) {
+      return searchLogic.GetValuesWithoutNaN<T>(columnIndex, considerSelection);
     }