Changeset 14077 for stable/HeuristicLab.DataPreprocessing/3.4/Logic/StatisticsLogic.cs

Timestamp:

07/14/16 22:41:02 (8 years ago)

Author:

mkommend

Message:

#2616: Merged r13934, r13935 into stable.

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Logic/StatisticsLogic.cs (modified) (5 diffs)

stable/HeuristicLab.DataPreprocessing/3.4/Logic/StatisticsLogic.cs

@@ -71 +71 @@
     }
 
-    public T GetMin<T>(int columnIndex, bool considerSelection = false) where T : IComparable<T> {
-      var min = default(T);
+    public T GetMin<T>(int columnIndex, T defaultValue, bool considerSelection = false) where T : IComparable<T> {
+      var min = defaultValue;
       if (preprocessingData.VariableHasType<T>(columnIndex)) {
         var values = GetValuesWithoutNaN<T>(columnIndex, considerSelection);
@@ -82 +82 @@
     }
 
-    public T GetMax<T>(int columnIndex, bool considerSelection = false) where T : IComparable<T> {
-      var max = default(T);
+    public T GetMax<T>(int columnIndex, T defaultValue, bool considerSelection = false) where T : IComparable<T> {
+      var max = defaultValue;
       if (preprocessingData.VariableHasType<T>(columnIndex)) {
         var values = GetValuesWithoutNaN<T>(columnIndex, considerSelection);
@@ -131 +131 @@
     }
 
-    public T GetMostCommonValue<T>(int columnIndex, bool considerSelection = false) {
+    public T GetMostCommonValue<T>(int columnIndex, T defaultValue, bool considerSelection = false) {
       var values = GetValuesWithoutNaN<T>(columnIndex, considerSelection);
       if (!values.Any())
-        return default(T);
+        return defaultValue;
       return values.GroupBy(x => x)
                               .OrderByDescending(g => g.Count())
@@ -165 +165 @@
       double percentile = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
-        percentile = GetValuesWithoutNaN<double>(columnIndex).Quantile(0.25);
-      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
-        percentile = GetDateTimeAsSeconds(columnIndex).Quantile(0.25);
+        percentile = GetValuesWithoutNaN<double>(columnIndex).DefaultIfEmpty(double.NaN).Quantile(0.25);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).DefaultIfEmpty(double.NaN).Quantile(0.25);
       }
       return percentile;
@@ -175 +175 @@
       double percentile = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
-        percentile = GetValuesWithoutNaN<double>(columnIndex).Quantile(0.75);
-      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
-        percentile = GetDateTimeAsSeconds(columnIndex).Quantile(0.75);
+        percentile = GetValuesWithoutNaN<double>(columnIndex).DefaultIfEmpty(double.NaN).Quantile(0.75);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).DefaultIfEmpty(double.NaN).Quantile(0.75);
       }
       return percentile;