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

Timestamp:

05/07/14 13:19:42 (10 years ago)

Author:

sbreuer

Message:

• provide default value (false) for considerSelection parameter

File:

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

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

@@ -129 +129 @@
       double stdDev = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        stdDev = GetValuesWithoutNaN<double>(columnIndex, false).StandardDeviation();
+        stdDev = GetValuesWithoutNaN<double>(columnIndex).StandardDeviation();
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        stdDev = GetDateTimeAsSeconds(columnIndex, false).StandardDeviation();
+        stdDev = GetDateTimeAsSeconds(columnIndex).StandardDeviation();
       }
       return stdDev;
@@ -139 +139 @@
       double variance = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        variance = preprocessingData.GetValues<double>(columnIndex, false).Variance();
+        variance = preprocessingData.GetValues<double>(columnIndex).Variance();
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
-        variance = GetDateTimeAsSeconds(columnIndex, false).Variance();
+        variance = GetDateTimeAsSeconds(columnIndex).Variance();
       }
       return variance;
@@ -147 +147 @@
 
     public int GetDifferentValuesCount<T>(int columnIndex) {
-      return preprocessingData.GetValues<T>(columnIndex, false).GroupBy(x => x).Count();
+      return preprocessingData.GetValues<T>(columnIndex).GroupBy(x => x).Count();
     }
 
@@ -179 +179 @@
     }
 
-    private IEnumerable<double> GetDateTimeAsSeconds(int columnIndex, bool considerSelection) {
+    private IEnumerable<double> GetDateTimeAsSeconds(int columnIndex, bool considerSelection = false) {
       return GetValuesWithoutNaN<DateTime>(columnIndex, considerSelection).Select(x => (double)x.Ticks / TimeSpan.TicksPerSecond);
     }
 
-    private IEnumerable<T> GetValuesWithoutNaN<T>(int columnIndex, bool considerSelection) {
+    private IEnumerable<T> GetValuesWithoutNaN<T>(int columnIndex, bool considerSelection = false) {
       return searchLogic.GetValuesWithoutNaN<T>(columnIndex, considerSelection);
     }