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

Timestamp:

07/09/14 10:37:01 (10 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/TransactionalPreprocessingData.cs (modified) (6 diffs)

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

@@ -115 +115 @@
     }
 
-    public override bool IsType<T>(int columnIndex) {
+    public override bool VariableHasType<T>(int columnIndex) {
       return variableValues[columnIndex] is List<T>;
     }
@@ -138 +138 @@
     public override void SetValues<T>(int columnIndex, IList<T> values) {
       SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
-      if (IsType<T>(columnIndex)) {
+      if (VariableHasType<T>(columnIndex)) {
         variableValues[columnIndex] = (IList)values;
       } else {
@@ -149 +149 @@
     public override bool SetValue(string value, int columnIndex, int rowIndex) {
       bool valid = false;
-      if (IsType<double>(columnIndex)) {
+      if (VariableHasType<double>(columnIndex)) {
         double val;
         valid = double.TryParse(value, out val);
         SetValueIfValid(columnIndex, rowIndex, valid, val);
-      } else if (IsType<string>(columnIndex)) {
+      } else if (VariableHasType<string>(columnIndex)) {
         valid = value != null;
         SetValueIfValid(columnIndex, rowIndex, valid, value);
-      } else if (IsType<DateTime>(columnIndex)) {
+      } else if (VariableHasType<DateTime>(columnIndex)) {
         DateTime date;
         valid = DateTime.TryParse(value, out date);
@@ -177 +177 @@
       bool valid = false;
       errorMessage = string.Empty;
-      if (IsType<double>(columnIndex)) {
+      if (VariableHasType<double>(columnIndex)) {
         double val;
         valid = double.TryParse(value, out val);
@@ -183 +183 @@
           errorMessage = "Invalid Value (Valid Value Format: \"" + FormatPatterns.GetDoubleFormatPattern() + "\")";
         }
-      } else if (IsType<string>(columnIndex)) {
+      } else if (VariableHasType<string>(columnIndex)) {
         valid = value != null;
         if (!valid) {
           errorMessage = "Invalid Value (string must not be null)";
         }
-      } else if (IsType<DateTime>(columnIndex)) {
+      } else if (VariableHasType<DateTime>(columnIndex)) {
         DateTime date;
         valid = DateTime.TryParse(value, out date);
@@ -207 +207 @@
 
     public override bool AreAllStringColumns(IEnumerable<int> columnIndices) {
-      return columnIndices.All(x => IsType<string>(x));
+      return columnIndices.All(x => VariableHasType<string>(x));
     }