Changeset 18100 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer

Timestamp:

12/01/21 13:40:55 (3 years ago)

Author:

chaider

Message:

#3140

• some more refactoring
• added possibility to set value of num nodes in infix parser
• changed displaying style of number

File:

• branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (5 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -82 +82 @@
       knownSymbols = new BidirectionalLookup<string, ISymbol>(StringComparer.InvariantCulture, new SymbolComparer());
 
-    private Num num = new Num();
-    private RealConstant realConstant = new RealConstant();
+    private Number number = new Number();
+    private Constant constant = new Constant();
     private Variable variable = new Variable();
     private BinaryFactorVariable binaryFactorVar = new BinaryFactorVariable();
@@ -181 +181 @@
             && str[pos] != ']'
             && str[pos] != '}'
-            && str[pos] != ',') {
+            && str[pos] != ','
+            && str[pos] != '>') {
             sb.Append(str[pos]);
             pos++;
@@ -333 +334 @@
           foreach (var negTerm in negTerms) sumNeg.AddSubtree(negTerm);
 
-          var constNode = (NumTreeNode)num.CreateTreeNode();
+          var constNode = (NumberTreeNode)number.CreateTreeNode();
           constNode.Value = -1.0;
           var prod = GetSymbol("*").CreateTreeNode();
@@ -532 +533 @@
         }
       } else if (next.TokenType == TokenType.LeftAngleBracket) {
+        Token numberTok = null;
         var leftAngleBracket = tokens.Dequeue();
         if (leftAngleBracket.TokenType != TokenType.LeftAngleBracket)
@@ -539 +541 @@
         if (idTok.TokenType != TokenType.Identifier || idTok.strVal.ToLower() != "num")
           throw new ArgumentException("string 'num' expected");
+
+        if (tokens.Peek().TokenType == TokenType.Eq) {
+          var equalTok = tokens.Dequeue();
+          if (tokens.Peek().TokenType != TokenType.Number)
+            throw new ArgumentException("No value for number specified.");
+
+          numberTok = tokens.Dequeue();
+        }
+
         var rightAngleBracket = tokens.Dequeue();
         if (rightAngleBracket.TokenType != TokenType.RightAngleBracket)
           throw new ArgumentException("closing bracket > expected");
-        var numNode = (NumTreeNode)num.CreateTreeNode();
+        var numNode = (NumberTreeNode)number.CreateTreeNode();
+        if (numberTok != null) numNode.Value = numberTok.doubleVal;
         return numNode;
       } else if (next.TokenType == TokenType.Number) {
         var numTok = tokens.Dequeue();
-        var constNode = (RealConstantTreeNode)realConstant.CreateTreeNode();
+        var constNode = (ConstantTreeNode)constant.CreateTreeNode();
         constNode.Value = numTok.doubleVal;
         return constNode;