Changeset 6769 for trunk

Timestamp:

09/15/11 16:12:10 (13 years ago)

Author:

gkronber

Message:

#1640 fixed a bug in the interpretation of lagged variables introduced with r6740.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• Tests/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (1 diff)
• Tests/SymbolicExpressionImporter.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -415 +415 @@
             if (actualRow < 0 || actualRow >= dataset.Rows)
               return double.NaN;
-            return ((IList<double>)currentInstr.iArg0)[row] * laggedVariableTreeNode.Weight;
+            return ((IList<double>)currentInstr.iArg0)[actualRow] * laggedVariableTreeNode.Weight;
           }
         case OpCodes.Constant: {

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tests/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

@@ -292 +292 @@
       Evaluate(interpreter, ds, "(mean -1.0 1.0 -1.0)", 0, -1.0 / 3.0);
 
+      // lag
+      Evaluate(interpreter, ds, "(lagVariable 1.0 a -1) ", 1, ds.GetDoubleValue("A", 0));
+      Evaluate(interpreter, ds, "(lagVariable 1.0 a -1) ", 2, ds.GetDoubleValue("A", 1));
+      Evaluate(interpreter, ds, "(lagVariable 1.0 a 0) ", 2, ds.GetDoubleValue("A", 2));
+      Evaluate(interpreter, ds, "(lagVariable 1.0 a 1) ", 0, ds.GetDoubleValue("A", 1));
     }
 

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Tests/SymbolicExpressionImporter.cs

@@ -29 +29 @@
   internal class SymbolicExpressionImporter {
     private const string VARSTART = "VAR";
+    private const string LAGGEDVARSTART = "LAG";
     private const string DEFUNSTART = "DEFUN";
     private const string ARGSTART = "ARG";
@@ -58 +59 @@
     Constant constant = new Constant();
     Variable variable = new Variable();
+    LaggedVariable laggedVariable = new LaggedVariable();
     Defun defun = new Defun();
 
@@ -96 +98 @@
         if (tokens.Peek().StringValue.StartsWith(VARSTART)) {
           tree = ParseVariable(tokens);
+        } else if (tokens.Peek().StringValue.StartsWith(LAGGEDVARSTART)) {
+          tree = ParseLaggedVariable(tokens);
         } else if (tokens.Peek().StringValue.StartsWith(DEFUNSTART)) {
           tree = ParseDefun(tokens);
@@ -157 +161 @@
     }
 
+    private ISymbolicExpressionTreeNode ParseLaggedVariable(Queue<Token> tokens) {
+      Token varTok = tokens.Dequeue();
+      Debug.Assert(varTok.StringValue == "LAGVARIABLE");
+      LaggedVariableTreeNode t = (LaggedVariableTreeNode)laggedVariable.CreateTreeNode();
+      t.Weight = tokens.Dequeue().DoubleValue;
+      t.VariableName = tokens.Dequeue().StringValue;
+      t.Lag = (int)tokens.Dequeue().DoubleValue;
+      return t;
+    }
+
     private ISymbolicExpressionTreeNode CreateTree(Token token) {
       if (token.Symbol != TokenSymbol.SYMB) throw new FormatException("Expected function symbol, but got: " + token.StringValue);