Changeset 15849 for branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration

Timestamp:

03/20/18 13:49:19 (7 years ago)

Author:

lkammere

Message:

#2886: Add constants to grammar.

Location:

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration

Files:

• GrammarEnumeration/Grammar.cs (modified) (7 diffs)
• Hashing/Hasher.cs (modified) (1 diff)

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs

@@ -42 +42 @@
     public TerminalSymbol Inv;
 
-    // For infix notation
-    public TerminalSymbol OpeningBracket;
-    public TerminalSymbol ClosingBracket;
+    public TerminalSymbol Const;
 
     #endregion
@@ -93 +91 @@
       Inv = new TerminalSymbol("inv");
 
-      OpeningBracket = new TerminalSymbol("(");
-      ClosingBracket = new TerminalSymbol(")");
+      Const = new TerminalSymbol("c");
       #endregion
 
@@ -107 +104 @@
 
       productions[Expr] = new[] {
-        new Production(Term, Expr, Addition),
-        new Production(Term)
+        new Production(Const, Term, Multiplication, Expr, Addition),
+        new Production(Const, Term, Multiplication, Const, Addition)
       };
 
@@ -126 +123 @@
 
       productions[LogFactor] = new[] { new Production(SimpleExpr, Log) };
-      productions[ExpFactor] = new[] { new Production(SimpleTerm, Exp) };
+      productions[ExpFactor] = new[] { new Production(Const, SimpleTerm, Multiplication, Exp) };
       productions[SinFactor] = new[] { new Production(SimpleExpr, Sin) };
       productions[CosFactor] = new[] { new Production(SimpleExpr, Cos) };
 
       productions[SimpleExpr] = new[] {
-        new Production(SimpleTerm, SimpleExpr, Addition),
-        new Production(SimpleTerm)
+        new Production(Const, SimpleTerm, Multiplication, SimpleExpr, Addition),
+        new Production(Const, SimpleTerm, Multiplication, Const, Addition)
       };
 
@@ -141 +138 @@
 
       productions[InvExpr] = new[] {
-        new Production(InvTerm, InvExpr, Addition),
-        new Production(InvTerm)
+        new Production(Const, InvTerm, Multiplication, InvExpr, Addition),
+        new Production(Const, InvTerm, Multiplication, Const, Addition)
       };
 
@@ -206 +203 @@
       if (currentSymbol == Addition) {
         parsedSubTree = addSy.CreateTreeNode();
-        parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack)); // left part
-        parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack)); // right part
+        ISymbolicExpressionTreeNode rightSubtree = ParseSymbolicExpressionTree(parseStack);
+        if (rightSubtree is ConstantTreeNode) {
+          ((ConstantTreeNode)rightSubtree).Value = 0.0;
+        }
+        parsedSubTree.AddSubtree(rightSubtree); // left part
+
+        ISymbolicExpressionTreeNode leftSubtree = ParseSymbolicExpressionTree(parseStack);
+        if (leftSubtree is ConstantTreeNode) {
+          ((ConstantTreeNode)leftSubtree).Value = 0.0;
+        }
+        parsedSubTree.AddSubtree(leftSubtree); // right part
 
       } else if (currentSymbol == Multiplication) {
@@ -236 +242 @@
         parsedSubTree.AddSubtree(dividend);
         parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
+
+      } else if (currentSymbol == Const) {
+        ConstantTreeNode constNode = (ConstantTreeNode)constSy.CreateTreeNode();
+        constNode.Value = 1.0;
+        parsedSubTree = constNode;
 
       } else if (currentSymbol is VariableTerminalSymbol) {

branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/Hashing/Hasher.cs

@@ -44 +44 @@
       }
 
-      // var or nonterminal symbol
+      // var, const or nonterminal symbol
       return new[] { AggregateHashes(currentSymbol, new THashType[0]) };
     }