Changeset 7805 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3

Timestamp:

05/14/12 15:21:28 (12 years ago)

Author:

sforsten

Message:

#1784: changes have been applied, according to the review comments of mkommend

File:

• branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/TableFileParser.cs (modified) (4 diffs)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/TableFileParser.cs

@@ -33 +33 @@
   public class TableFileParser {
     private const int BUFFER_SIZE = 1024;
-    private readonly char[] POSSIBLE_SEPARATORS = new char[] { ',', ';', '\t' };
+    private static readonly char[] POSSIBLE_SEPARATORS = new char[] { ',', ';', '\t' };
     private Tokenizer tokenizer;
     private List<List<object>> rowValues;
@@ -75 +75 @@
     }
 
-    public void Parse(string fileName) {
-      NumberFormatInfo numberFormat;
-      DateTimeFormatInfo dateTimeFormatInfo;
-      char separator;
-      DetermineFileFormat(fileName, out numberFormat, out dateTimeFormatInfo, out separator);
-      using (StreamReader reader = new StreamReader(fileName)) {
+    public void Parse(string fileName, NumberFormatInfo numberFormat, DateTimeFormatInfo dateTimeFormatInfo, char separator) {
+      Parse(new FileStream(fileName, FileMode.Open), numberFormat, dateTimeFormatInfo, separator);
+    }
+
+    public void Parse(Stream stream, NumberFormatInfo numberFormat, DateTimeFormatInfo dateTimeFormatInfo, char separator) {
+      using (StreamReader reader = new StreamReader(stream)) {
         tokenizer = new Tokenizer(reader, numberFormat, dateTimeFormatInfo, separator);
         // parse the file
@@ -125 +125 @@
     }
 
-    private void DetermineFileFormat(string fileName, out NumberFormatInfo numberFormat, out DateTimeFormatInfo dateTimeFormatInfo, out char separator) {
-      using (StreamReader reader = new StreamReader(fileName)) {
+    public static void DetermineFileFormat(string path, out NumberFormatInfo numberFormat, out DateTimeFormatInfo dateTimeFormatInfo, out char separator) {
+      DetermineFileFormat(new FileStream(path, FileMode.Open), out numberFormat, out dateTimeFormatInfo, out separator);
+    }
+
+    public static void DetermineFileFormat(Stream stream, out NumberFormatInfo numberFormat, out DateTimeFormatInfo dateTimeFormatInfo, out char separator) {
+      using (StreamReader reader = new StreamReader(stream)) {
         // skip first line
         reader.ReadLine();
@@ -197 +201 @@
     }
 
-    private int OccurrencesOf(Dictionary<char, int> charCounts, char c) {
+    private static int OccurrencesOf(Dictionary<char, int> charCounts, char c) {
       return charCounts.ContainsKey(c) ? charCounts[c] : 0;
     }