Changeset 13151 for stable/HeuristicLab.DataPreprocessing/3.4/Implementations

Timestamp:

11/13/15 21:02:54 (9 years ago)

Author:

gkronber

Message:

#2491: merged r13034 and r13051 from trunk to stable branch

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Implementations/StatisticsLogic.cs (modified) (2 diffs)

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

@@ -166 +166 @@
       double percentile = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
-        percentile = GetValuesWithoutNaN<double>(columnIndex).Percentile(0.25);
-      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
-        percentile = GetDateTimeAsSeconds(columnIndex).Percentile(0.25);
+        percentile = GetValuesWithoutNaN<double>(columnIndex).Quantile(0.25);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).Quantile(0.25);
       }
       return percentile;
@@ -176 +176 @@
       double percentile = double.NaN;
       if (preprocessingData.VariableHasType<double>(columnIndex)) {
-        percentile = GetValuesWithoutNaN<double>(columnIndex).Percentile(0.75);
-      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
-        percentile = GetDateTimeAsSeconds(columnIndex).Percentile(0.75);
+        percentile = GetValuesWithoutNaN<double>(columnIndex).Quantile(0.75);
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
+        percentile = GetDateTimeAsSeconds(columnIndex).Quantile(0.75);
       }
       return percentile;