Changeset 2287

Timestamp:

08/14/09 11:14:26 (15 years ago)

Author:

gkronber

Message:

Fixed bug in s-expression importer. #719

File:

• trunk/tools/CedmaImporter/SymbolicExpressionImporter.cs (modified) (5 diffs)

trunk/tools/CedmaImporter/SymbolicExpressionImporter.cs

@@ -13 +13 @@
 namespace CedmaImporter {
   public class SymbolicExpressionImporter {
-
+    private const string DIFFSTART = "dif";
+    private const string VARSTART = "var";
     private Dictionary<string, IFunction> knownFunctions = new Dictionary<string, IFunction>() 
       {
@@ -51 +52 @@
     private IEnumerable<Token> GetTokenStream(StreamReader reader) {
       return from line in GetLineStream(reader)
-             let strTokens = line.Split(new string[] { " ", "\t", Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable()
+             let strTokens = line.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries).AsEnumerable()
              from strToken in strTokens
              let t = Token.Parse(strToken)
@@ -64 +65 @@
 
     private HeuristicLab.GP.Interfaces.IFunctionTree ParseSexp(Queue<Token> tokens) {
-      Expect(Token.LPAR, tokens);
-
-      if (tokens.Peek().Symbol == TokenSymbol.SYMB) {
-        if (tokens.Peek().StringValue.Equals("variable")) {
-          return ParseVariable(tokens);
-        } else if (tokens.Peek().StringValue.Equals("differential")) {
-          return ParseDifferential(tokens);
+      if (tokens.Peek().Symbol == TokenSymbol.LPAR) {
+        IFunctionTree tree;
+        Expect(Token.LPAR, tokens);
+        if (tokens.Peek().StringValue.StartsWith(VARSTART)) {
+          tree = ParseVariable(tokens);
+        } else if (tokens.Peek().StringValue.StartsWith(DIFFSTART)) {
+          tree = ParseDifferential(tokens);
         } else {
           Token curToken = tokens.Dequeue();
-          IFunctionTree tree = CreateTree(curToken);
+          tree = CreateTree(curToken);
           while (!tokens.Peek().Equals(Token.RPAR)) {
             tree.AddSubTree(ParseSexp(tokens));
           }
-          Expect(Token.RPAR, tokens);
-          return tree;
         }
+        Expect(Token.RPAR, tokens);
+        return tree;
       } else if (tokens.Peek().Symbol == TokenSymbol.NUMBER) {
         ConstantFunctionTree t = (ConstantFunctionTree)constant.GetTreeNode();
         t.Value = tokens.Dequeue().DoubleValue;
         return t;
-      } else {
-        throw new FormatException("Expected function or constant symbol");
-      }
+      } else throw new FormatException("Expected function or constant symbol");
     }
 
@@ -95 +94 @@
       t.VariableName = tokens.Dequeue().StringValue;
       t.SampleOffset = (int)tokens.Dequeue().DoubleValue;
-      Expect(Token.RPAR, tokens);
       return t;
     }
@@ -105 +103 @@
       t.VariableName = tokens.Dequeue().StringValue;
       t.SampleOffset = (int)tokens.Dequeue().DoubleValue;
-      Expect(Token.RPAR, tokens);
       return t;
     }