Changeset 4462 for branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis

Timestamp:

09/21/10 14:18:06 (14 years ago)

Author:

gkronber

Message:

Changed symbolic simplifier to work for multi-variate models and return a symbolic expression tree that can be directly evaluated. #1142

File:

• branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs (modified) (2 diffs)

branches/DataAnalysis/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs

@@ -44 +44 @@
       // macro expand (initially no argument trees)
       var macroExpandedTree = MacroExpand(clone, clone.SubTrees[0], new List<SymbolicExpressionTreeNode>());
-      return new SymbolicExpressionTree(GetSimplifiedTree(macroExpandedTree));
+      SymbolicExpressionTreeNode rootNode = (new ProgramRootSymbol()).CreateTreeNode();
+      rootNode.AddSubTree(GetSimplifiedTree(macroExpandedTree));
+      return new SymbolicExpressionTree(rootNode);
     }
 
@@ -63 +65 @@
         // return the correct argument sub-tree (already macro-expanded)
         return (SymbolicExpressionTreeNode)argumentTrees[argSym.ArgumentIndex].Clone();
-      } else if (node.Symbol is StartSymbol) {
-        return MacroExpand(root, subtrees[0], argumentTrees);
       } else {
         // recursive application