Changeset 5377

Timestamp:

01/25/11 18:09:47 (14 years ago)

Author:

mkommend

Message:

ticket #1256 - Changed SymbolicSimplifier to handle lagged variables correctly.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/SymbolicSimplifier.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/SymbolicRegressionSolution.cs

@@ -98 +98 @@
       var laggedTreeNode = node as ILaggedTreeNode;
       if (laggedTreeNode != null) lag += laggedTreeNode.Lag;
-      if (node.Symbol is Derivative) lag -= 4;
+      else if (node.Symbol is Derivative) lag -= 4;
 
       int subtreeLag = 0;

trunk/sources/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>()
-                            group node by node.VariableName into g
+                            let lag = (node is LaggedVariableTreeNode) ? ((LaggedVariableTreeNode)node).Lag : 0
+                            group node by node.VariableName + lag into g
                             select g;
+
       var unchangedSubTrees = subtrees.Where(t => !(t is VariableTreeNode));
 
@@ -429 +431 @@
       while (prod.SubTrees.Count > 0) prod.RemoveSubTree(0);
       var groupedVarNodes = from node in subtrees.OfType<VariableTreeNode>()
-                            group node by node.VariableName into g
+                            let lag = (node is LaggedVariableTreeNode) ? ((LaggedVariableTreeNode)node).Lag : 0
+                            group node by node.VariableName + lag into g
                             orderby g.Count()
                             select g;