Changeset 11576 for branches/OptimizationNetworks/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs

Timestamp:

11/25/14 03:26:00 (10 years ago)

Author:

swagner

Message:

#2205: Merged changes r11062:11557 from trunk/sources into branches/OptimizationNetworks

Location:

branches/OptimizationNetworks

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs (modified) (3 diffs)

branches/OptimizationNetworks/HeuristicLab.Problems.Instances.DataAnalysis/3.3/TableFileParser.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2013 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -169 +169 @@
       //create columns
       for (int col = 0; col < columns; col++) {
-        var types = rowValues.Select(r => r[col]).Where(v => v != null && v as string != string.Empty).Take(10).Select(v => v.GetType());
+        var types = rowValues.Select(r => r[col]).Where(v => v != null && v as string != string.Empty).Take(100).Select(v => v.GetType());
         if (!types.Any()) {
           values.Add(new List<string>());
@@ -193 +193 @@
             values[columnIndex].Add(DateTime.MinValue);
           else if (values[columnIndex] is List<string> && !(element is string))
-            values[columnIndex].Add(string.Empty);
+            values[columnIndex].Add(element.ToString());
           else
             values[columnIndex].Add(element);