Changeset 620

Timestamp:

10/03/08 13:26:31 (16 years ago)

Author:

gkronber

Message:

added checks if the imported data seems valid and throw DataFormatException which should be handled by objects that use the DatasetParser. (fixed #292)

File:

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

trunk/sources/HeuristicLab.DataAnalysis/DatasetParser.cs

@@ -322 +322 @@
     private void Parse(bool strict) {
       ParseMetaData(strict);
+      if(!tokenizer.HasNext()) Error("Couldn't parse data values. Probably because of incorrect number format (the parser expects english number format with a '.' as decimal separator).", "", tokenizer.CurrentLineNumber);
       ParseSampleData(strict);
+      if(samplesList.Count == 0) Error("Couldn't parse data values. Probably because of incorrect number format (the parser expects english number format with a '.' as decimal separator).", "", tokenizer.CurrentLineNumber);
     }
 
@@ -372 +374 @@
 
     private void ParseMetaData(bool strict) {
-      while(tokenizer.Peek().type == TokenTypeEnum.String) {
+      while(tokenizer.HasNext() && tokenizer.Peek().type == TokenTypeEnum.String) {
         Token nameToken = tokenizer.Next();
         if(nameToken.type != TokenTypeEnum.String)