Changeset 17319

Timestamp:

10/04/19 16:56:04 (10 days ago)

Author:

gkronber

Message:

#2994: recheck cbrt() and sqrt() autoDiff tests

Location:

branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4

Files:

• IntervalEvaluatorAutoDiffTest.cs (modified) (4 diffs)
• IntervalEvaluatorTest.cs (modified) (2 diffs)

branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/IntervalEvaluatorAutoDiffTest.cs

@@ -151 +151 @@
         { "y", new Interval(1, 2) },
         { "z", new Interval(0, 1) },
+        { "eps", new Interval(1e-10, 1) }           
       };
       var r = eval.Evaluate(t, intervals, paramNodes, out double[] lg, out double[] ug);
@@ -174 +175 @@
       Assert.AreEqual(1, r.UpperBound);
 
-      Assert.AreEqual(0, lg[0]); // z
-      Assert.AreEqual(0.5 * Math.Sqrt(2), ug[0], 1e-5);
+      Assert.AreEqual(double.NaN, lg[0]); // z
+      Assert.AreEqual(0.5, ug[0], 1e-5);
+
+      t = parser.Parse("sqrt(eps)");
+      paramNodes = t.IterateNodesPostfix().Where(n => n.SubtreeCount == 0).ToArray();
+      r = eval.Evaluate(t, intervals, paramNodes, out lg, out ug);
+
+      Assert.AreEqual(0.5 * Math.Sqrt(1e-10), lg[0], 1e-6); // z          --> lim x -> 0 (sqrt(x)) = 0
+      Assert.AreEqual(0.5, ug[0], 1e-5);
     }
 
@@ -207 +215 @@
       Assert.AreEqual(1.0 / 3.0 * Math.Pow(2, 1.0 / 3.0), ug[0], 1e-5);
 
-      t = parser.Parse("sqrt(z)");
+      t = parser.Parse("cuberoot(z)");
       paramNodes = t.IterateNodesPostfix().Where(n => n.SubtreeCount == 0).ToArray();
       r = eval.Evaluate(t, intervals, paramNodes, out lg, out ug);
@@ -213 +221 @@
       Assert.AreEqual(1.0, r.UpperBound);
 
-      Assert.AreEqual(0.0, lg[0]); // z
+      Assert.AreEqual(double.NaN, lg[0]); // z
       Assert.AreEqual(1.0 / 3.0, ug[0], 1e-5);
     }

branches/2994-AutoDiffForIntervals/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/IntervalEvaluatorTest.cs

@@ -210 +210 @@
     }
 
+    [TestMethod]
+    [TestCategory("Problems.DataAnalysis.Symbolic")]
+    [TestProperty("Time", "short")]
+    public void IntervalEvaluatorSqrt() {
+      EvaluateTest("sqrt(x1)", new Interval(0, 1), new Dictionary<string, Interval>() { {"x1", new Interval(0, 1) }});
+    }
 
 
@@ -219 +225 @@
       var evaluator = new IntervalEvaluator();
       var intervals = new Dictionary<string, Interval>() {
-        {"x", new Interval(1, 2) }
+        {"x", new Interval(1, 2) },
+        {"unit", new Interval(0, 1) },
       };
 
       var t = parser.Parse("SQR(EXP(CUBE((2.10981074965936*'x'))))");
-      var r = evaluator.Evaluate(t, intervals);
-      AssertInterval(143638040.396283, 1.81198989971641E+65, r);
+      AssertInterval(143638040.396283, 1.81198989971641E+65, evaluator.Evaluate(t, intervals));
+
+
+      t = parser.Parse("sqrt(unit)");
+      AssertInterval(0, 1, evaluator.Evaluate(t, intervals));
+
     }