Changeset 7851 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ClassificationInstanceProvider.cs

Timestamp:

05/21/12 11:13:32 (12 years ago)

Author:

sforsten

Message:

#1784: changed the TableFileParser, so that you don't have to determine the file format by yourself. Comments have been added for the different Parse methods.

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• . (modified) (1 prop)
• Classification/ClassificationInstanceProvider.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Classification/ClassificationInstanceProvider.cs

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -32 +31 @@
   public abstract class ClassificationInstanceProvider : IProblemInstanceProvider<IClassificationProblemData> {
     public IClassificationProblemData LoadData(string path) {
-      NumberFormatInfo numberFormat;
-      DateTimeFormatInfo dateFormat;
-      char separator;
-      TableFileParser.DetermineFileFormat(new FileStream(path, FileMode.Open), out numberFormat, out dateFormat, out separator);
-
-      IClassificationProblemData claData = LoadData(new FileStream(path, FileMode.Open), numberFormat, dateFormat, separator);
-      int pos = path.LastIndexOf('\\');
-      if (pos < 0)
-        claData.Name = path;
-      else {
-        pos++;
-        claData.Name = path.Substring(pos, path.Length - pos);
-      }
-
-      return claData;
-    }
-
-    protected IClassificationProblemData LoadData(Stream stream, NumberFormatInfo numberFormat, DateTimeFormatInfo dateFormat, char separator) {
       TableFileParser csvFileParser = new TableFileParser();
 
-      csvFileParser.Parse(stream, numberFormat, dateFormat, separator);
+      csvFileParser.Parse(path);
 
       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);
@@ -65 +46 @@
       claData.TestPartition.Start = trainingPartEnd;
       claData.TestPartition.End = csvFileParser.Rows;
+      int pos = path.LastIndexOf('\\');
+      if (pos < 0)
+        claData.Name = path;
+      else {
+        pos++;
+        claData.Name = path.Substring(pos, path.Length - pos);
+      }
+
       return claData;
     }