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

Timestamp:

04/16/18 15:19:58 (6 years ago)

Author:

lkammere

Message:

#2886: Changes in search heuristic for solving Poly-10 problem. Adapt tree evaluation to cover non-terminal symbols.

File:

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

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

@@ -176 +176 @@
 
     public double EvaluatePhrase(SymbolString s, IRegressionProblemData problemData, bool optimizeConstants) {
-      // Create sentences without Expression symbols.
-      Symbol[] sEval = new Symbol[s.Count()];
-
-      for (int i = 0; i < sEval.Length; i++) {
-        Symbol currSym = s[i];
-        if (currSym is NonterminalSymbol && currSym != Expr)
-          return 0.0;
-
-        if (currSym == Expr) {
-          sEval[i] = Const;
-        } else {
-          sEval[i] = currSym;
-        }
-      }
-
-      SymbolicExpressionTree tree = ParseSymbolicExpressionTree(new SymbolString(sEval));
+      SymbolicExpressionTree tree = ParseSymbolicExpressionTree(s);
+
       double r2 = RSquaredEvaluator.Evaluate(problemData, tree, optimizeConstants);
 
@@ -208 +194 @@
     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!");
 
       var rootNode = rootSy.CreateTreeNode();
@@ -214 +199 @@
       rootNode.AddSubtree(startNode);
 
-      Stack<TerminalSymbol> parseStack = new Stack<TerminalSymbol>(sentence.OfType<TerminalSymbol>());
+      Stack<Symbol> parseStack = new Stack<Symbol>(sentence);
       startNode.AddSubtree(ParseSymbolicExpressionTree(parseStack));
 
@@ -220 +205 @@
     }
 
-    public ISymbolicExpressionTreeNode ParseSymbolicExpressionTree(Stack<TerminalSymbol> parseStack) {
-      TerminalSymbol currentSymbol = parseStack.Pop();
+    public ISymbolicExpressionTreeNode ParseSymbolicExpressionTree(Stack<Symbol> parseStack) {
+      Symbol currentSymbol = parseStack.Pop();
 
       ISymbolicExpressionTreeNode parsedSubTree = null;
@@ -273 +258 @@
         varNode.VariableName = currentSymbol.StringRepresentation;
         parsedSubTree = varNode;
+
+      } else if (currentSymbol is NonterminalSymbol) {
+        ConstantTreeNode constNode = (ConstantTreeNode)constSy.CreateTreeNode();
+        constNode.Value = 0.0;
+        parsedSubTree = constNode;
       }