Changeset 14077 for stable/HeuristicLab.DataPreprocessing/3.4/Logic/ManipulationLogic.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/ManipulationLogic.cs (modified) (3 diffs)

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

@@ -85 +85 @@
         foreach (var column in cells) {
           if (preprocessingData.VariableHasType<double>(column.Key)) {
-            double max = statisticsLogic.GetMax<double>(column.Key, considerSelection);
-            double min = statisticsLogic.GetMin<double>(column.Key, considerSelection);
+            double max = statisticsLogic.GetMax<double>(column.Key, double.NaN, considerSelection);
+            double min = statisticsLogic.GetMin<double>(column.Key, double.NaN, considerSelection);
             double randMultiplier = (max - min);
             foreach (int index in column.Value) {
@@ -93 +93 @@
             }
           } else if (preprocessingData.VariableHasType<DateTime>(column.Key)) {
-            DateTime min = statisticsLogic.GetMin<DateTime>(column.Key, considerSelection);
-            DateTime max = statisticsLogic.GetMax<DateTime>(column.Key, considerSelection);
+            DateTime min = statisticsLogic.GetMin<DateTime>(column.Key, DateTime.MinValue, considerSelection);
+            DateTime max = statisticsLogic.GetMax<DateTime>(column.Key, DateTime.MinValue, considerSelection);
             double randMultiplier = (max - min).TotalSeconds;
             foreach (int index in column.Value) {
@@ -213 +213 @@
         foreach (var column in cells) {
           if (preprocessingData.VariableHasType<double>(column.Key)) {
-            ReplaceIndicesByValue<double>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<double>(column.Key, considerSelection));
+            ReplaceIndicesByValue<double>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<double>(column.Key, double.NaN, considerSelection));
           } else if (preprocessingData.VariableHasType<string>(column.Key)) {
-            ReplaceIndicesByValue<string>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<string>(column.Key, considerSelection));
+            ReplaceIndicesByValue<string>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<string>(column.Key, string.Empty, considerSelection));
           } else if (preprocessingData.VariableHasType<DateTime>(column.Key)) {
-            ReplaceIndicesByValue<DateTime>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<DateTime>(column.Key, considerSelection));
+            ReplaceIndicesByValue<DateTime>(column.Key, column.Value, statisticsLogic.GetMostCommonValue<DateTime>(column.Key, DateTime.MinValue, considerSelection));
           } else {
             throw new ArgumentException("column with index: " + column.Key + " contains a non supported type.");