Changeset 15795

Timestamp:

02/21/18 10:44:54 (6 years ago)

Author:

lkammere

Message:

#2886: Remove nested divisions from grammar and hashing.

Location:

branches/2886_SymRegGrammarEnumeration

Files:

• HeuristicLab.Algorithms.DataAnalysis.SymRegGrammarEnumeration/GrammarEnumeration/Grammar.cs (modified) (8 diffs)
• Test/TreeHashingTest.cs (modified) (3 diffs)

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

@@ -27 +27 @@
     public NonterminalSymbol SimpleTerm;
 
+    public NonterminalSymbol InvExpr;
+    public NonterminalSymbol InvTerm;
+
     public TerminalSymbol Addition;
     public TerminalSymbol Multiplication;
@@ -74 +77 @@
       SimpleTerm = new NonterminalSymbol("SimpleTerm");
 
+      InvExpr = new NonterminalSymbol("InvExpr");
+      InvTerm = new NonterminalSymbol("InvTerm");
+
       Addition = new TerminalSymbol("+");
       Multiplication = new TerminalSymbol("*");
@@ -93 +99 @@
 
       Term.AddProduction(Factor, Term, Multiplication);
-      Term.AddProduction(Expr, Inv, Term, Multiplication);
       Term.AddProduction(Factor);
+      Term.AddProduction(InvExpr, Inv);
 
       Factor.AddProduction(Var);
@@ -110 +116 @@
       SimpleTerm.AddProduction(Var, SimpleTerm, Multiplication);
       SimpleTerm.AddProduction(Var);
+
+      InvExpr.AddProduction(InvTerm, InvExpr, Addition);
+      InvExpr.AddProduction(InvTerm);
+
+      InvTerm.AddProduction(Factor, InvTerm, Multiplication);
+      InvTerm.AddProduction(Factor);
       #endregion
 
@@ -137 +149 @@
 
       Stack<Symbol> parseStack = new Stack<Symbol>(sentence);
-      CancelOutCompoundInverse(parseStack);
 
       Symbol peek = parseStack.Peek();
@@ -145 +156 @@
 
     private string[] GetSubtreeHashes(Stack<Symbol> parseStack) {
-      CancelOutCompoundInverse(parseStack);
       Symbol currentSymbol = parseStack.Pop();
 
@@ -237 +247 @@
     }
 
+    /*
     private void CancelOutCompoundInverse(Stack<Symbol> parseStack) {
       // Resolve compound divisions
@@ -250 +261 @@
         parseStack.Push(Inv);
       } // else: compound divisions fully cancel out each other.
-    }
+    } */
     #endregion
 

branches/2886_SymRegGrammarEnumeration/Test/TreeHashingTest.cs

@@ -132 +132 @@
     }
 
+    /* DEPRECATED; SINCE WE DO NOT ALLOW COMPOUND DIVISIONS
     [TestMethod]
     [TestCategory("TreeHashing")]
@@ -158 +159 @@
     [TestMethod]
     [TestCategory("TreeHashing")]
-    public void a_UncancelableCompoundInverse() {
+    public void UncancelableCompoundInverse() {
       // 1 / ( 1/b + sin(a*c) )
       SymbolString s1 = new SymbolString(new Symbol[] { varB, grammar.Inv, varA, varC, grammar.Multiplication, grammar.Sin, grammar.Addition, grammar.Inv });
@@ -168 +169 @@
 
       Assert.AreNotEqual(hash1, hash2);
-    }
+    }*/
 
     #region parser