Changeset 16727 for branches/2994-AutoDiffForIntervals/Tests

Timestamp:

03/29/19 15:01:47 (6 years ago)

Author:

gkronber

Message:

#2994: added a unit test and made some minor improvements to interpreters

File:

• branches/2994-AutoDiffForIntervals/Tests/AutoDiffTest.cs (modified) (3 diffs)

branches/2994-AutoDiffForIntervals/Tests/AutoDiffTest.cs

@@ -76 +76 @@
         var ds = new Dataset(vars, values);
         var problemData = new RegressionProblemData(ds, vars, "f(x)");
-        evaluator.Evaluate(t, ds, problemData.TrainingIndices.ToArray(), paramNodes, out double[] train, out double[,] trainJac);
+        var train = new double[problemData.TrainingIndices.Count()];
+        var trainJac = new double[train.Length, 2];
+        evaluator.Evaluate(t, ds, problemData.TrainingIndices.ToArray(), paramNodes, train, trainJac);
         Assert.AreEqual(2, train.Length);
         Assert.AreEqual(3, train[0]);
@@ -86 +88 @@
         Assert.AreEqual(1, trainJac[1, 1]);
 
-        evaluator.Evaluate(t, ds, problemData.TestIndices.ToArray(), paramNodes, out double[] test, out double[,] testJac);
+        var test = new double[problemData.TestIndices.Count()];
+        var testJac = new double[test.Length, 2];
+        evaluator.Evaluate(t, ds, problemData.TestIndices.ToArray(), paramNodes, test, testJac);
         Assert.AreEqual(3, test.Length);
         Assert.AreEqual(5, test[0]);
@@ -124 +128 @@
       }
 
+      {
+        // as discussed with Fabrício
+        var intervals = new Dictionary<string, Interval>();
+        intervals.Add("x1", new Interval(60.0, 65.0));
+        intervals.Add("x2", new Interval(30.0, 40.0));
+        intervals.Add("x3", new Interval(5.0, 10.0));
+        intervals.Add("x4", new Interval(0.5, 0.8));
+        intervals.Add("x5", new Interval(0.2, 0.5));
+
+        var parser = new InfixExpressionParser();
+
+        var t1 = parser.Parse("x5/x4");
+        var t2 = parser.Parse("log(x5/x4)");
+        var t3 = parser.Parse("x3 * log(x5/x4)");
+        var t4 = parser.Parse("x1*x2*x5");
+        var t5 = parser.Parse("x4/x5");
+        var t6 = parser.Parse("sqr(x4/x5)");
+        var t7 = parser.Parse("(1 - sqr(x4/x5)) ");
+        var t8 = parser.Parse("x1*x2*x5 *(1 - sqr(x4/x5))");
+        var t9 = parser.Parse("x1*x2*x5 *(1 - sqr(x4/x5)) + x3 * log(x5/x4)");
+
+        var evaluator = new IntervalEvaluator();
+        var result = evaluator.Evaluate(t1, intervals);
+        Assert.AreEqual(0.25, result.LowerBound);
+        Assert.AreEqual(1, result.UpperBound);
+
+        result = evaluator.Evaluate(t2, intervals);
+        Assert.AreEqual(-1.386294361, result.LowerBound, 1e-6);
+        Assert.AreEqual(0, result.UpperBound);
+
+        result = evaluator.Evaluate(t3, intervals);
+        Assert.AreEqual(-13.86294361, result.LowerBound, 1e-6);
+        Assert.AreEqual(0, result.UpperBound);
+
+        result = evaluator.Evaluate(t4, intervals);
+        Assert.AreEqual(360, result.LowerBound);
+        Assert.AreEqual(1300, result.UpperBound);
+
+        result = evaluator.Evaluate(t5, intervals);
+        Assert.AreEqual(1, result.LowerBound, 1e-6);
+        Assert.AreEqual(4, result.UpperBound);
+
+        result = evaluator.Evaluate(t6, intervals);
+        Assert.AreEqual(1, result.LowerBound);
+        Assert.AreEqual(16, result.UpperBound);
+
+        result = evaluator.Evaluate(t7, intervals);
+        Assert.AreEqual(-15, result.LowerBound);
+        Assert.AreEqual(0, result.UpperBound);
+
+        result = evaluator.Evaluate(t8, intervals);
+        Assert.AreEqual(-19500, result.LowerBound);
+        Assert.AreEqual(0, result.UpperBound);
+
+        result = evaluator.Evaluate(t9, intervals);
+        Assert.AreEqual(-19513.86294, result.LowerBound, 1e-3);
+        Assert.AreEqual(0, result.UpperBound);
+
+
+      }
+
     }
   }