Changeset 6776 for trunk

Timestamp:

09/16/11 08:28:12 (13 years ago)

Author:

gkronber

Message:

#1640 fixed a bug in parsing datetime values and improved code for filling dataset columns

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/TableFileParser.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/TableFileParser.cs

@@ -98 +98 @@
         }
 
-        var columnType = types.GroupBy(v => v).OrderBy(v => v).Last().Key;
+        var columnType = types.GroupBy(v => v).OrderBy(v => v.Count()).Last().Key;
         if (columnType == typeof(double)) values.Add(new List<double>());
         else if (columnType == typeof(DateTime)) values.Add(new List<DateTime>());
@@ -111 +111 @@
         int columnIndex = 0;
         foreach (object element in row) {
-          //handle missing values with default values
-          if (element as string == string.Empty) {
-            if (values[columnIndex] is List<double>) values[columnIndex].Add(double.NaN);
-            else if (values[columnIndex] is List<DateTime>) values[columnIndex].Add(DateTime.MinValue);
-            else if (values[columnIndex] is List<string>) values[columnIndex].Add(string.Empty);
-            else throw new InvalidOperationException();
-          } else values[columnIndex].Add(element);
+          if (values[columnIndex] is List<double> && !(element is double))
+            values[columnIndex].Add(double.NaN);
+          else if (values[columnIndex] is List<DateTime> && !(element is DateTime))
+            values[columnIndex].Add(DateTime.MinValue);
+          else if (values[columnIndex] is List<string> && !(element is string))
+            values[columnIndex].Add(string.Empty);
+          else
+            values[columnIndex].Add(element);
           columnIndex++;
         }
@@ -296 +297 @@
           token.type = TokenTypeEnum.Double;
           return token;
-        } else if (DateTime.TryParse(strToken, out token.dateTimeValue)) {
+        } else if (DateTime.TryParse(strToken, dateTimeFormatInfo, DateTimeStyles.None, out token.dateTimeValue)) {
           token.type = TokenTypeEnum.DateTime;
           return token;