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

Timestamp:

03/20/18 17:40:11 (7 years ago)

Author:

lkammere

Message:

#2886: Remove cosine terminal symbols.

Location:

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

Files:

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

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

@@ -38 +38 @@
     public TerminalSymbol Exp;
     public TerminalSymbol Sin;
-    public TerminalSymbol Cos;
     public TerminalSymbol Inv;
 
@@ -56 +55 @@
     private ISymbol divSy;
     private ISymbol sinSy;
-    private ISymbol cosSy;
 
     private ISymbol rootSy;
@@ -86 +84 @@
       Exp = new TerminalSymbol("exp");
       Sin = new TerminalSymbol("sin");
-      Cos = new TerminalSymbol("cos");
       Inv = new TerminalSymbol("inv");
 
@@ -158 +155 @@
       divSy = symbolicExpressionGrammar.Symbols.OfType<Division>().First();
       sinSy = symbolicExpressionGrammar.Symbols.OfType<Sine>().First();
-      cosSy = symbolicExpressionGrammar.Symbols.OfType<Cosine>().First();
 
       rootSy = symbolicExpressionGrammar.Symbols.OfType<ProgramRootSymbol>().First();
@@ -228 +224 @@
         parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
 
-      } else if (currentSymbol == Cos) {
-        parsedSubTree = cosSy.CreateTreeNode();
-        parsedSubTree.AddSubtree(ParseSymbolicExpressionTree(parseStack));
-
       } else if (currentSymbol == Inv) {
         parsedSubTree = divSy.CreateTreeNode();

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

@@ -38 +38 @@
       // LOG, EXP, SIN, INV
       if (currentSymbol == Grammar.Log || currentSymbol == Grammar.Exp ||
-          currentSymbol == Grammar.Sin || currentSymbol == Grammar.Cos ||
-          currentSymbol == Grammar.Inv) {
+          currentSymbol == Grammar.Sin || currentSymbol == Grammar.Inv) {
         // Directly aggregate the single subtree
         return new[] { AggregateHashes(parseStack.Peek(), GetSubtreeHashes(parseStack)) };