Changeset 272 for trunk

Timestamp:

05/29/08 17:22:10 (16 years ago)

Author:

gkronber

Message:

fixed #158

File:

• trunk/sources/HeuristicLab.DataAnalysis/DatasetParser.cs (modified) (14 diffs)

trunk/sources/HeuristicLab.DataAnalysis/DatasetParser.cs

@@ -61 +61 @@
         List<Token> nameList = metadata["VARIABLENAMES"];
         string[] names = new string[nameList.Count];
-        for (int i = 0; i < names.Length; i++) {
+        for(int i = 0; i < names.Length; i++) {
           names[i] = nameList[i].stringValue;
         }
@@ -111 +111 @@
       tokenizer.Separators = new string[] { " ", ";", "\t" };
 
-      // parse the file
-      Parse(strict);
+      try {
+        // parse the file
+        Parse(strict);
+      } finally {
+        reader.Close();
+      }
 
       // translate the list of samples into a DoubleMatrixData item
@@ -121 +125 @@
       int i = 0;
       int j = 0;
-      foreach (List<double> row in samplesList) {
+      foreach(List<double> row in samplesList) {
         j = 0;
-        foreach (double element in row) {
+        foreach(double element in row) {
           samples[i * columns + j] = element;
           j++;
@@ -180 +184 @@
 
       private void ReadNextTokens() {
-        if (!reader.EndOfStream) {
+        if(!reader.EndOfStream) {
           CurrentLine = reader.ReadLine();
           Token[] newTokens = Array.ConvertAll(CurrentLine.Split(separators, StringSplitOptions.RemoveEmptyEntries), delegate(string str) {
@@ -193 +197 @@
 
       private Token MakeToken(string strToken) {
-        if (strToken == "@")
+        if(strToken == "@")
           return AtToken;
-        else if (strToken == "=")
+        else if(strToken == "=")
           return AssignmentToken;
         else {
@@ -202 +206 @@
           // try invariant culture
           NumberFormatInfo currentNumberFormatInfo = CultureInfo.InvariantCulture.NumberFormat;
-          if (int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
+          if(int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
             token.type = TokenTypeEnum.Int;
             return token;
-          } else if (double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
+          } else if(double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
             token.type = TokenTypeEnum.Double;
             return token;
@@ -211 +215 @@
           // try german culture
           currentNumberFormatInfo = CultureInfo.GetCultureInfo("de-DE").NumberFormat;
-          if (int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
+          if(int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
             token.type = TokenTypeEnum.Int;
             return token;
-          } else if (double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
+          } else if(double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
             token.type = TokenTypeEnum.Double;
             return token;
@@ -221 +225 @@
           // try current culture
           currentNumberFormatInfo = CultureInfo.CurrentCulture.NumberFormat;
-          if (int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
+          if(int.TryParse(strToken, NumberStyles.Integer, currentNumberFormatInfo, out token.intValue)) {
             token.type = TokenTypeEnum.Int;
             return token;
-          } else if (double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
+          } else if(double.TryParse(strToken, NumberStyles.Float, currentNumberFormatInfo, out token.doubleValue)) {
             token.type = TokenTypeEnum.Double;
             return token;
@@ -241 +245 @@
         Token next = tokens[0];
         tokens.RemoveAt(0);
-        if (tokens.Count == 0) {
+        if(tokens.Count == 0) {
           ReadNextTokens();
         }
@@ -261 +265 @@
     private void ParseSampleData(bool strict) {
       List<double> row = new List<double>();
-      while (tokenizer.HasNext()) {
+      while(tokenizer.HasNext()) {
         Token current = tokenizer.Next();
-        if (current.type == TokenTypeEnum.Double) {
+        if(current.type == TokenTypeEnum.Double) {
           // just take the value
           row.Add(current.doubleValue);
-        } else if (current.type == TokenTypeEnum.Int) {
+        } else if(current.type == TokenTypeEnum.Int) {
           // translate the int value to double
           row.Add((double)current.intValue);
-        } else if (current == Tokenizer.NewlineToken) {
+        } else if(current == Tokenizer.NewlineToken) {
           // when parsing strictly all rows have to have the same number of values            
-          if (strict) {
+          if(strict) {
             // the first row defines how many samples are needed
-            if (samplesList.Count > 0 && samplesList[0].Count != row.Count) {
+            if(samplesList.Count > 0 && samplesList[0].Count != row.Count) {
               Error("The first row of the dataset has " + samplesList[0].Count + " columns." +
                 "\nLine " + tokenizer.CurrentLineNumber + " has " + row.Count + " columns.");
             }
-          } else if (samplesList.Count > 0) {
+          } else if(samplesList.Count > 0) {
             // when we are not strict then fill or drop elements as needed
-            if (samplesList[0].Count > row.Count) {
+            if(samplesList[0].Count > row.Count) {
               // fill with NAN
-              for (int i = row.Count; i < samplesList[0].Count; i++) {
+              for(int i = row.Count; i < samplesList[0].Count; i++) {
                 row.Add(double.NaN);
               }
-            } else if (samplesList[0].Count < row.Count) {
+            } else if(samplesList[0].Count < row.Count) {
               // drop last k elements where k = n - length of first row
               row.RemoveRange(samplesList[0].Count - 1, row.Count - samplesList[0].Count);
@@ -296 +300 @@
           // found an unexpected token => return false when parsing strictly
           // when we are parsing non-strictly we also allow unreadable values inserting NAN instead
-          if (strict) {
+          if(strict) {
             Error("Unkown value " + current + " in line " + tokenizer.CurrentLineNumber +
               "\n" + tokenizer.CurrentLine);
@@ -307 +311 @@
 
     private void ParseMetaData(bool strict) {
-      while (tokenizer.Peek() == Tokenizer.AtToken) {
+      while(tokenizer.Peek() == Tokenizer.AtToken) {
         Expect(Tokenizer.AtToken);
 
         Token nameToken = tokenizer.Next();
-        if (nameToken.type != TokenTypeEnum.String)
+        if(nameToken.type != TokenTypeEnum.String)
           throw new Exception("Expected a variable name; got " + nameToken +
             "\nLine " + tokenizer.CurrentLineNumber + ": " + tokenizer.CurrentLine);
@@ -319 +323 @@
         List<Token> tokens = new List<Token>();
         Token valueToken = tokenizer.Next();
-        while (valueToken != Tokenizer.NewlineToken) {
+        while(valueToken != Tokenizer.NewlineToken) {
           tokens.Add(valueToken);
           valueToken = tokenizer.Next();
@@ -330 +334 @@
     private void Expect(Token expectedToken) {
       Token actualToken = tokenizer.Next();
-      if (actualToken != expectedToken) {
+      if(actualToken != expectedToken) {
         Error("Expected: " + expectedToken + " got: " + actualToken +
           "\nLine " + tokenizer.CurrentLineNumber + ": " + tokenizer.CurrentLine);