Changeset 9616 for branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression

Timestamp:

06/12/13 15:02:47 (12 years ago)

Author:

ascheibe

Message:

#2030 merged trunk into hive performance branch

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/CSV/RegressionCSVInstanceProvider.cs (modified) (1 diff)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs (modified) (1 diff)

branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/CSV/RegressionCSVInstanceProvider.cs

@@ -57 +57 @@
     public override IRegressionProblemData ImportData(string path) {
       TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(path);
+      csvFileParser.Parse(path, csvFileParser.AreColumnNamesInFirstLine(path));
 
       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);

branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/ResourceRegressionInstanceProvider.cs

@@ -49 +49 @@
         TableFileParser csvFileParser = new TableFileParser();
         using (Stream stream = instancesZipFile.GetInputStream(entry)) {
-          csvFileParser.Parse(stream, numberFormat, dateFormat, separator);
+          csvFileParser.Parse(stream, numberFormat, dateFormat, separator, true);
         }