Changeset 15817

Timestamp:

02/26/18 14:13:38 (6 years ago)

Author:

lkammere

Message:

#2886: Add cosine to grammar.

File:

• branches/2886_SymRegGrammarEnumeration/HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs (modified) (10 diffs)

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

@@ -22 +22 @@
     public NonterminalSymbol ExpFactor;
     public NonterminalSymbol SinFactor;
+    public NonterminalSymbol CosFactor;
 
     public NonterminalSymbol SimpleExpr;
@@ -34 +35 @@
     public TerminalSymbol Exp;
     public TerminalSymbol Sin;
+    public TerminalSymbol Cos;
     public TerminalSymbol Inv;
 
@@ -54 +56 @@
     private ISymbol divSy;
     private ISymbol sinSy;
-
+    private ISymbol cosSy;
+    
     private ISymbol rootSy;
     private ISymbol startSy;
@@ -69 +72 @@
       ExpFactor = new NonterminalSymbol("ExpFactor");
       SinFactor = new NonterminalSymbol("SinFactor");
-
+      CosFactor = new NonterminalSymbol("CosFactor");
+         
       SimpleExpr = new NonterminalSymbol("SimpleExpr");
       SimpleTerm = new NonterminalSymbol("SimpleTerm");
@@ -81 +85 @@
       Exp = new TerminalSymbol("exp");
       Sin = new TerminalSymbol("sin");
+      Cos = new TerminalSymbol("cos");
       Inv = new TerminalSymbol("inv");
 
@@ -101 +106 @@
       Factor.AddProduction(ExpFactor);
       Factor.AddProduction(SinFactor);
+      Factor.AddProduction(CosFactor);
 
       LogFactor.AddProduction(SimpleExpr, Log);
       ExpFactor.AddProduction(SimpleTerm, Exp);
       SinFactor.AddProduction(SimpleExpr, Sin);
+      CosFactor.AddProduction(SimpleExpr, Cos);
 
       SimpleExpr.AddProduction(SimpleTerm, SimpleExpr, Addition);
@@ -131 +138 @@
       divSy = symbolicExpressionGrammar.Symbols.OfType<Division>().First();
       sinSy = symbolicExpressionGrammar.Symbols.OfType<Sine>().First();
+      cosSy = symbolicExpressionGrammar.Symbols.OfType<Cosine>().First();
 
       rootSy = symbolicExpressionGrammar.Symbols.OfType<ProgramRootSymbol>().First();
@@ -223 +231 @@
       // LOG, EXP, SIN, INV
       if (ReferenceEquals(currentSymbol, Log) || ReferenceEquals(currentSymbol, Exp) ||
-          ReferenceEquals(currentSymbol, Sin) || ReferenceEquals(currentSymbol, Inv)) {
+          ReferenceEquals(currentSymbol, Sin) || ReferenceEquals(currentSymbol, Cos) ||
+          ReferenceEquals(currentSymbol, Inv)) {
         return new[] { aggregateHashes(parseStack.Peek(), GetSubtreeHashes(parseStack, aggregateHashes)) };
       }
@@ -308 +317 @@
         parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
 
+      } else if (ReferenceEquals(currentSymbol, Cos)) {
+        parsedSubTree = cosSy.CreateTreeNode();
+        parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
+
       } else if (ReferenceEquals(currentSymbol, Inv)) {
         parsedSubTree = divSy.CreateTreeNode();
@@ -350 +363 @@
 
       } else if (ReferenceEquals(head, Log) || ReferenceEquals(head, Exp)
-              || ReferenceEquals(head, Sin) || ReferenceEquals(head, Inv)) {
+              || ReferenceEquals(head, Sin) || ReferenceEquals(head, Cos) 
+              || ReferenceEquals(head, Inv)) {
         result.Add(head);
         result.Add(OpeningBracket);