Changeset 5076 for branches

Timestamp:

12/09/10 10:45:36 (14 years ago)

Author:

mkommend

Message:

Corrected persistence of VariableCondition and conditional evaluator (ticket #1256).

Location:

branches/GP.Symbols (TimeLag, Diff, Integral)

Files:

• HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionConditionalPearsonsRSquaredEvaluator.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableCondition.cs (modified) (1 diff)

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionConditionalPearsonsRSquaredEvaluator.cs

@@ -23 +23 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -32 +31 @@
 using HeuristicLab.Problems.DataAnalysis.Evaluators;
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
-using HeuristicLab.Problems.DataAnalysis.Symbolic.Symbols;
 
 namespace HeuristicLab.Problems.DataAnalysis.Regression.Symbolic.Evaluators {
@@ -73 +71 @@
       OnlinePearsonsRSquaredEvaluator r2Evaluator = new OnlinePearsonsRSquaredEvaluator();
 
-      int minLag = 0;
-      var laggedTreeNodes = solution.IterateNodesPrefix().OfType<LaggedVariableTreeNode>();
-      if (laggedTreeNodes.Any())
-        minLag = laggedTreeNodes.Min(laggedTreeNode => laggedTreeNode.Symbol.MinLag);
+      int minLag = GetMinimumLagFromTree(solution.Root);
 
       while (originalEnumerator.MoveNext() && estimatedEnumerator.MoveNext() && rowsEnumerator.MoveNext()) {
@@ -88 +83 @@
         }
 
-        if (evaluate)
-          if (dataset[conditionVariable, row].IsAlmost(0.0) && dataset[conditionVariable, row - 1].IsAlmost(0.0)) {
-            if (double.IsNaN(estimated))
-              estimated = upperEstimationLimit;
-            else
-              estimated = Math.Min(upperEstimationLimit, Math.Max(lowerEstimationLimit, estimated));
-            r2Evaluator.Add(original, estimated);
-          }
+        if (evaluate) {
+          if (double.IsNaN(estimated))
+            estimated = upperEstimationLimit;
+          else
+            estimated = Math.Min(upperEstimationLimit, Math.Max(lowerEstimationLimit, estimated));
+          r2Evaluator.Add(original, estimated);
+        }
       }
 
       if (estimatedEnumerator.MoveNext() || originalEnumerator.MoveNext() || rowsEnumerator.MoveNext()) {
         throw new ArgumentException("Number of elements in original and estimated enumeration doesn't match.");
-      } else {
-        return r2Evaluator.RSquared;
+      } else return r2Evaluator.RSquared;
+    }
+
+    protected static int GetMinimumLagFromTree(SymbolicExpressionTreeNode node) {
+      if (node == null) return 0;
+      int lag = 0;
+
+      var laggedTreeNode = node as ILaggedTreeNode;
+      if (laggedTreeNode != null) lag += laggedTreeNode.Lag;
+
+      int subtreeLag = 0;
+      foreach (var subtree in node.SubTrees) {
+        subtreeLag = Math.Min(subtreeLag, GetMinimumLagFromTree(subtree));
       }
+      return lag + subtreeLag;
     }
 

branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/Symbols/VariableCondition.cs

@@ -144 +144 @@
     #region persistence and cloning
     [StorableConstructor]
-    protected VariableCondition(bool deserializing) : base(deserializing) { }
+    protected VariableCondition(bool deserializing)
+      : base(deserializing) {
+      variableNames = new List<string>();
+    }
     protected VariableCondition(VariableCondition original, Cloner cloner)
       : base(original, cloner) {