Changeset 7154 for branches/HeuristicLab.TimeSeries/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

Timestamp:

12/07/11 22:47:12 (12 years ago)

Author:

gkronber

Message:

#1081: worked on multi-variate time series prognosis

File:

• branches/HeuristicLab.TimeSeries/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs (modified) (5 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeInterpreterTest.cs

@@ -315 +315 @@
       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));
+      //Evaluate(interpreter, ds, "(lagVariable 1.0 a 1) ", 0, ds.GetDoubleValue("A", 1));
 
       // integral
       Evaluate(interpreter, ds, "(integral -1.0 (variable 1.0 a)) ", 1, ds.GetDoubleValue("A", 0) + ds.GetDoubleValue("A", 1));
-      Evaluate(interpreter, ds, "(integral -1.0 (lagVariable 1.0 a 1)) ", 1, ds.GetDoubleValue("A", 1) + ds.GetDoubleValue("A", 2));
+      Evaluate(interpreter, ds, "(integral -1.0 (lagVariable 1.0 a -1)) ", 3, ds.GetDoubleValue("A", 1) + ds.GetDoubleValue("A", 2));
       Evaluate(interpreter, ds, "(integral -2.0 (variable 1.0 a)) ", 2, ds.GetDoubleValue("A", 0) + ds.GetDoubleValue("A", 1) + ds.GetDoubleValue("A", 2));
       Evaluate(interpreter, ds, "(integral -1.0 (* (variable 1.0 a) (variable 1.0 b)))", 1, ds.GetDoubleValue("A", 0) * ds.GetDoubleValue("B", 0) + ds.GetDoubleValue("A", 1) * ds.GetDoubleValue("B", 1));
@@ -336 +336 @@
 
       // timelag
-      Evaluate(interpreter, ds, "(lag -1.0 (lagVariable 1.0 a 2)) ", 1, ds.GetDoubleValue("A", 2));
-      Evaluate(interpreter, ds, "(lag -2.0 (lagVariable 1.0 a 2)) ", 2, ds.GetDoubleValue("A", 2));
-      Evaluate(interpreter, ds, "(lag -1.0 (* (lagVariable 1.0 a 1) (lagVariable 1.0 b 2)))", 1, ds.GetDoubleValue("A", 1) * ds.GetDoubleValue("B", 2));
+      Evaluate(interpreter, ds, "(lag -1.0 (lagVariable 1.0 a -2)) ", 5, ds.GetDoubleValue("A", 2));
+      Evaluate(interpreter, ds, "(lag -2.0 (lagVariable 1.0 a -2)) ", 5, ds.GetDoubleValue("A", 1));
+      Evaluate(interpreter, ds, "(lag -1.0 (* (lagVariable 1.0 a -1) (lagVariable 1.0 b -2)))", 3, ds.GetDoubleValue("A", 1) * ds.GetDoubleValue("B", 0));
       Evaluate(interpreter, ds, "(lag -2.0 3.0)", 1, 3.0);
 
@@ -349 +349 @@
       Evaluate(interpreter, ds, @"(PROG 
                                     (MAIN (lagVariable 1.0 a -1) (lagVariable 1.0 b -1)))", new string[] { "A", "B" }, Enumerable.Range(1, 2), 3,
-      new[] { new[] { 1.0, 1.0, 1.0 }, new[] { 1.0, 1.0, 1.0 } },
-      new[] { new[] { 2.0, 2.0, 2.0 }, new[] { 2.0, 2.0, 2.0 } }
+      new[] { new[] { 1.0, 1.0},
+              new[] { 1.0, 1.0},
+              new[] { 1.0, 1.0}},
+      new[] { new[] { 2.0, 2.0},
+              new[] { 2.0, 2.0},
+              new[] { 2.0, 2.0} }
         );
 
@@ -364 +368 @@
       Evaluate(interpreter, ds, @"(PROG 
                                      (MAIN (lagVariable 2.0 a -2) (lagVariable 1.0 a -1)))", new string[] { "A", "B" }, Enumerable.Range(2, 3), 4,
-      new[] { new[] { 2.0, 4.0, 4.0, 8.0 }, new[] { 2.0, 2.0, 4.0, 4.0 } },
-      new[] { new[] { 4.0, 2.0, 8.0, 4.0 }, new[] { 1.0, 4.0, 2.0, 8.0 } },
-      new[] { new[] { 2.0, 2.0, 4.0, 4.0 }, new[] { 1.0, 2.0, 2.0, 4.0 } }
+      new[] { new[] { 2.0, 2.0},
+              new[] { 4.0, 2.0},
+              new[] { 4.0, 4.0},
+              new[] { 8.0, 4.0}},
+      new[] { new[] { 4.0, 1.0},
+              new[] { 2.0, 4.0},
+              new[] { 8.0, 2.0},
+              new[] { 4.0, 8.0}},
+      new[] { new[] { 2.0, 1.0},
+              new[] { 2.0, 2.0},
+              new[] { 4.0, 2.0},
+              new[] { 4.0, 4.0}}
         );
     }
@@ -384 +397 @@
       ISymbolicExpressionTree tree = importer.Import(expr);
 
-      var allPrognosis = interpreter.GetSymbolicExpressionTreeValues(tree, ds, targetVariables, rows, horizon);
+      var allPrognosis = interpreter.GetSymbolicExpressionTreeValues(tree, ds, targetVariables, rows, horizon).GetEnumerator();
       int i = 0;
-      foreach (var actual in allPrognosis) {
-        var actualEnumerator = actual.GetEnumerator();
-        var expectedEnumerator = expected[i].GetEnumerator();
-        while (actualEnumerator.MoveNext() & expectedEnumerator.MoveNext()) {
-          var aEnumerator = actualEnumerator.Current.GetEnumerator();
+      var expectedEnumerator = expected[i].GetEnumerator();
+      while (allPrognosis.MoveNext()) {
+        while (expectedEnumerator.MoveNext()) {
           var eEnumerator = expectedEnumerator.Current.GetEnumerator();
-          while (aEnumerator.MoveNext() & eEnumerator.MoveNext()) {
-            Assert.IsFalse(double.IsNaN(aEnumerator.Current) && !double.IsNaN(eEnumerator.Current));
-            Assert.IsFalse(!double.IsNaN(aEnumerator.Current) && double.IsNaN(eEnumerator.Current));
-            Assert.AreEqual(eEnumerator.Current, aEnumerator.Current, 1.0E-12, expr);
+          while (eEnumerator.MoveNext()) {
+            Assert.IsFalse(double.IsNaN(allPrognosis.Current) && !double.IsNaN(eEnumerator.Current));
+            Assert.IsFalse(!double.IsNaN(allPrognosis.Current) && double.IsNaN(eEnumerator.Current));
+            Assert.AreEqual(eEnumerator.Current, allPrognosis.Current, 1.0E-12, expr);
+            allPrognosis.MoveNext();
           }
         }