Changeset 18171

Timestamp:

12/27/21 10:57:02 (3 years ago)

Author:

gkronber

Message:

#2938: fixed a bug in the parser

Location:

trunk

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (4 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/InfixExpressionParserTest.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -377 +377 @@
 
     private void FoldLeftRecursive(ISymbolicExpressionTreeNode parent) {
-      if (parent.SubtreeCount > 0) {
+      if (parent.SubtreeCount > 1) {
         var child = parent.GetSubtree(0);
         FoldLeftRecursive(child);
-        if(parent.Symbol == child.Symbol) {
+        if (parent.Symbol == child.Symbol && IsAssociative(parent.Symbol)) {
           parent.RemoveSubtree(0);
-          for(int i=0;i<child.SubtreeCount; i++) {
+          for (int i = 0; i < child.SubtreeCount; i++) {
             parent.InsertSubtree(i, child.GetSubtree(i));
           }
@@ -443 +443 @@
         // '<' 'num' [ '=' ['+'|'-'] number ] '>'
         return ParseNumber(tokens);
-      } else if(next.TokenType == TokenType.Operator && (next.strVal == "-" || next.strVal == "+")) {
+      } else if (next.TokenType == TokenType.Operator && (next.strVal == "-" || next.strVal == "+")) {
         // ['+' | '-' ] SimpleFact
         if (tokens.Dequeue().strVal == "-") {
@@ -499 +499 @@
         if (next.strVal == "+" || next.strVal == "-") {
           if (tokens.Dequeue().strVal == "-") sign = -1.0;
-        } 
-        if(tokens.Peek().TokenType != TokenType.Number) {
+        }
+        if (tokens.Peek().TokenType != TokenType.Number) {
           throw new ArgumentException("Expected number.");
         }
@@ -632 +632 @@
       return exprList.ToArray();
     }
+
+    private bool IsAssociative(ISymbol sy) {
+      return sy == GetSymbol("+") || sy == GetSymbol("-") ||
+             sy == GetSymbol("*") || sy == GetSymbol("/") ||
+             sy == GetSymbol("AND") || sy == GetSymbol("OR") || sy == GetSymbol("XOR");
+    }
   }
 }

trunk/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/InfixExpressionParserTest.cs

@@ -145 +145 @@
       // numeric parameter with sign
       Assert.AreEqual("1", formatter.Format(parser.Parse("-<num=-1.0>")));
+
+      // nested functions
+      Assert.AreEqual("SIN(SIN(SIN('X1')))", formatter.Format(parser.Parse("SIN(SIN(SIN(X1)))")));
     }
   }