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

Timestamp:

10/05/10 16:25:05 (14 years ago)

Author:

gkronber

Message:

Changed symbolic simplifier to handle time series specific terminals correctly. #1142

File:

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

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

@@ -354 +354 @@
       while (sum.SubTrees.Count > 0) sum.RemoveSubTree(0);
       var groupedVarNodes = from node in subtrees.OfType<VariableTreeNode>()
+                            where node.Symbol.Name == "Variable"
                             group node by node.VariableName into g
                             select g;
-      var unchangedSubTrees = subtrees.Where(t => !(t is VariableTreeNode));
+      var unchangedSubTrees = subtrees.Where(t => t.Symbol.Name != "Variable");
 
       foreach (var variableNodeGroup in groupedVarNodes) {
@@ -429 +430 @@
       while (prod.SubTrees.Count > 0) prod.RemoveSubTree(0);
       var groupedVarNodes = from node in subtrees.OfType<VariableTreeNode>()
+                            where node.Symbol.Name == "Variable"
                             group node by node.VariableName into g
                             orderby g.Count()
                             select g;
       var constantProduct = (from node in subtrees.OfType<VariableTreeNode>()
+                             where node.Symbol.Name == "Variable"
                              select node.Weight)
                             .Concat(from node in subtrees.OfType<ConstantTreeNode>()
@@ -440 +443 @@
 
       var unchangedSubTrees = from tree in subtrees
-                              where !(tree is VariableTreeNode)
+                              where !(tree is VariableTreeNode && tree.Symbol.Name == "Variable")
                               where !(tree is ConstantTreeNode)
                               select tree;