Changeset 14765 for branches/symbreg-factors-2650

Timestamp:

03/18/17 14:39:32 (8 years ago)

Author:

gkronber

Message:

#2650 added support for negative weights for parsing expressions with factors

Location:

branches/symbreg-factors-2650

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)

branches/symbreg-factors-2650/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -48 +48 @@
   /// ArgList       = Expr { ',' Expr }
   /// VarExpr       = varId OptFactorPart
-  /// OptFactorPart = [ ('=' varVal | '[' number {',' number } ']' ) ]
+  /// OptFactorPart = [ ('=' varVal | '[' ['+' | '-' ] number {',' ['+' | '-' ] number } ']' ) ]
   /// varId         =  ident | ' ident ' | " ident "
   /// varVal        =  ident | ' ident ' | " ident "
@@ -366 +366 @@
     /// ArgList       = Expr { ',' Expr }
     /// VarExpr       = varId OptFactorPart
-    /// OptFactorPart = [ ('=' varVal | '[' number {',' number } ']' ) ]
+    /// OptFactorPart = [ ('=' varVal | '[' ['+' | '-' ] number {',' ['+' | '-' ] number } ']' ) ]
     /// varId         =  ident | ' ident ' | " ident "
     /// varVal        =  ident | ' ident ' | " ident "
@@ -440 +440 @@
           } else if(tokens.Peek().TokenType == TokenType.LeftBracket) {
             // factor variable
-            var factorVariableNode = (FactorVariableTreeNode) factorVar.CreateTreeNode();
+            var factorVariableNode = (FactorVariableTreeNode)factorVar.CreateTreeNode();
             factorVariableNode.VariableName = idTok.strVal;
 
@@ -446 +446 @@
             var weights = new List<double>();
             // at least one weight is necessary
+            var sign = 1.0;
+            if(tokens.Peek().TokenType == TokenType.Operator) {
+              var opToken = tokens.Dequeue();
+              if(opToken.strVal == "+") sign = 1.0;
+              else if(opToken.strVal == "-") sign = -1.0;
+              else throw new ArgumentException();
+            }
             if(tokens.Peek().TokenType != TokenType.Number) throw new ArgumentException("number expected");
             var weightTok = tokens.Dequeue();
-            weights.Add(weightTok.doubleVal);
+            weights.Add(sign * weightTok.doubleVal);
             while(tokens.Peek().TokenType == TokenType.Comma) {
               // skip comma
               tokens.Dequeue();
+              if(tokens.Peek().TokenType == TokenType.Operator) {
+                var opToken = tokens.Dequeue();
+                if(opToken.strVal == "+") sign = 1.0;
+                else if(opToken.strVal == "-") sign = -1.0;
+                else throw new ArgumentException();
+              }
               weightTok = tokens.Dequeue();
               if(weightTok.TokenType != TokenType.Number) throw new ArgumentException("number expected");
-              weights.Add(weightTok.doubleVal);
+              weights.Add(sign * weightTok.doubleVal);
             }
             var rightBracketToken = tokens.Dequeue();

branches/symbreg-factors-2650/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/InfixExpressionParserTest.cs

@@ -111 +111 @@
       Console.WriteLine(formatter.Format(parser.Parse("x[1, 2] * y [1, 2]")));
 
+      Console.WriteLine(formatter.Format(parser.Parse("x [+1.0] * y")));
+      Console.WriteLine(formatter.Format(parser.Parse("x [-1.0] * y")));
+      Console.WriteLine(formatter.Format(parser.Parse("x [-1.0, -2.0] * y [+1.0, +2.0]")));
+
       Console.WriteLine(formatter.Format(parser.Parse("x='bla' * y")));
       Console.WriteLine(formatter.Format(parser.Parse("x = 'bla'")));
       Console.WriteLine(formatter.Format(parser.Parse("x = \"bla\"")));
       Console.WriteLine(formatter.Format(parser.Parse("1.0 * x = bla")));
-      Console.WriteLine(formatter.Format(parser.Parse("1.0 * \"x\" = bla + y = \"bla2\"")));
+      Console.WriteLine(formatter.Format(parser.Parse("-1.0 * x = bla")));
+      Console.WriteLine(formatter.Format(parser.Parse("+1.0 * \"x\" = bla + y = \"bla2\"")));
     }
   }