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

Timestamp:

02/28/18 14:44:25 (7 years ago)

Author:

lkammere

Message:

#2886 Move code for visualization and logging of sentences to separate classes.

File:

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

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

@@ -45 +45 @@
 
     #region HL Symbols for Parsing ExpressionTrees
-    private TypeCoherentExpressionGrammar symbolicExpressionGrammar;
 
     private ISymbol constSy;
@@ -57 +56 @@
     private ISymbol sinSy;
     private ISymbol cosSy;
-    
+
     private ISymbol rootSy;
     private ISymbol startSy;
+
+    private InfixExpressionFormatter infixExpressionFormatter;
     #endregion
 
@@ -73 +74 @@
       SinFactor = new NonterminalSymbol("SinFactor");
       CosFactor = new NonterminalSymbol("CosFactor");
-         
+
       SimpleExpr = new NonterminalSymbol("SimpleExpr");
       SimpleTerm = new NonterminalSymbol("SimpleTerm");
@@ -127 +128 @@
 
       #region Parsing to SymbolicExpressionTree
-      symbolicExpressionGrammar = new TypeCoherentExpressionGrammar();
+      var symbolicExpressionGrammar = new TypeCoherentExpressionGrammar();
       symbolicExpressionGrammar.ConfigureAsDefaultRegressionGrammar();
 
@@ -143 +144 @@
       startSy = symbolicExpressionGrammar.Symbols.OfType<StartSymbol>().First();
 
+      infixExpressionFormatter = new InfixExpressionFormatter();
       #endregion
     }
@@ -274 +276 @@
 
     #region Parse to SymbolicExpressionTree
+
+    public string ToInfixString(SymbolString sentence) {
+      Debug.Assert(sentence.Any(), "Trying to evaluate empty sentence!");
+      Debug.Assert(sentence.All(s => s is TerminalSymbol), "Trying to evaluate symbol sequence with nonterminalsymbols!");
+
+      return infixExpressionFormatter.Format(ParseSymbolicExpressionTree(sentence));
+    }
+
     public SymbolicExpressionTree ParseSymbolicExpressionTree(SymbolString sentence) {
       Debug.Assert(sentence.Any(), "Trying to evaluate empty sentence!");
       Debug.Assert(sentence.All(s => s is TerminalSymbol), "Trying to evaluate symbol sequence with nonterminalsymbols!");
-
-      symbolicExpressionGrammar.ConfigureAsDefaultRegressionGrammar();     // TODO: not necessary to call this for each sentence
 
       var rootNode = rootSy.CreateTreeNode();
@@ -339 +347 @@
     }
     #endregion
-
-    #region Parse to Infix string
-
-    public SymbolString PostfixToInfixParser(SymbolString phrase) {
-      Stack<Symbol> parseStack = new Stack<Symbol>(phrase);
-
-      return PostfixToInfixSubtreeParser(parseStack);
-    }
-
-    private SymbolString PostfixToInfixSubtreeParser(Stack<Symbol> parseStack) {
-      Symbol head = parseStack.Pop();
-
-      SymbolString result = new SymbolString(parseStack.Count);
-
-      if (ReferenceEquals(head, Addition) || ReferenceEquals(head, Multiplication)) {
-        // right part
-        SymbolString rightPart = PostfixToInfixSubtreeParser(parseStack);
-        SymbolString leftPart = PostfixToInfixSubtreeParser(parseStack);
-
-        result.AddRange(leftPart);
-        result.Add(head);
-        result.AddRange(rightPart);
-
-      } else if (ReferenceEquals(head, Log) || ReferenceEquals(head, Exp)
-              || ReferenceEquals(head, Sin) || ReferenceEquals(head, Cos) 
-              || ReferenceEquals(head, Inv)) {
-        result.Add(head);
-        result.Add(OpeningBracket);
-        result.AddRange(PostfixToInfixSubtreeParser(parseStack));
-        result.Add(ClosingBracket);
-
-      } else {
-        result.Add(head);
-      }
-      return result;
-    }
-
-    #endregion
   }
 }