Changeset 11156 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/SearchLogic.cs

Timestamp:

07/09/14 10:37:01 (8 years ago)

Author:

gkronber

Message:

#2206: made several changes / improvements to the data-preprocessing code while reviewing the code

File:

• trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/SearchLogic.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/Implementations/SearchLogic.cs

@@ -85 +85 @@
 
     public bool IsMissingValue(int columnIndex, int rowIndex) {
-      if (preprocessingData.IsType<double>(columnIndex)) {
+      if (preprocessingData.VariableHasType<double>(columnIndex)) {
         return double.IsNaN(preprocessingData.GetCell<double>(columnIndex, rowIndex));
-      } else if (preprocessingData.IsType<string>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<string>(columnIndex)) {
         return string.IsNullOrEmpty(preprocessingData.GetCell<string>(columnIndex, rowIndex));
-      } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+      } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
         return preprocessingData.GetCell<DateTime>(columnIndex, rowIndex).Equals(DateTime.MinValue);
       } else {
@@ -98 +98 @@
     public IList<int> GetMissingValueIndices(int columnIndex) {
       if (!MissingValueIndicies.ContainsKey(columnIndex)){        
-          if (preprocessingData.IsType<double>(columnIndex)) {
+          if (preprocessingData.VariableHasType<double>(columnIndex)) {
             MissingValueIndicies[columnIndex] = GetMissingValueIndices<double>(columnIndex);
-          } else if (preprocessingData.IsType<string>(columnIndex)) {
+          } else if (preprocessingData.VariableHasType<string>(columnIndex)) {
             MissingValueIndicies[columnIndex] = GetMissingValueIndices<string>(columnIndex);
-          } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
+          } else if (preprocessingData.VariableHasType<DateTime>(columnIndex)) {
             MissingValueIndicies[columnIndex] = GetMissingValueIndices<DateTime>(columnIndex);
           } else {