Changeset 6963

Timestamp:

11/08/11 11:01:33 (13 years ago)

Author:

gkronber

Message:

#1671 implemented quick fix for CSV importer and improved the import data dialog.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/TableFileParser.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs

@@ -80 +80 @@
       // openFileDialog
       // 
-      this.openFileDialog.FileName = "openFileDialog";
+      this.openFileDialog.Filter = "CSV files|*.csv|Text files|*.txt|All files|*.*";
+      this.openFileDialog.Title = "Import data...";
       // 
       // DataAnalysisProblemView

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

@@ -156 +156 @@
         } else if (OccurrencesOf(charCounts, ',') > 10) {
           // no points and many commas
-          int countCommaNonDigitPairs = 0;
-          for (int i = 0; i < charsRead - 1; i++) {
-            if (buffer[i] == ',' && !Char.IsDigit(buffer[i + 1])) {
-              countCommaNonDigitPairs++;
+          // count the number of tokens (chains of only digits and commas) that contain multiple comma characters
+          int tokensWithMultipleCommas = 0;
+          for (int i = 0; i < charsRead; i++) {
+            int nCommas = 0;
+            while (i < charsRead && (buffer[i] == ',' || Char.IsDigit(buffer[i]))) {
+              if (buffer[i] == ',') nCommas++;
+              i++;
             }
-          }
-          if (countCommaNonDigitPairs > 10) {
+            if (nCommas > 2) tokensWithMultipleCommas++;
+          }
+          if (tokensWithMultipleCommas > 1) {
             // English format (only integer values) with ',' as separator
             numberFormat = NumberFormatInfo.InvariantInfo;