Changeset 17200 for branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Interpreter.cs

Timestamp:

08/12/19 10:50:02 (5 years ago)

Author:

gkronber

Message:

#2994 implemented checking of autodiff with numeric differentials and fixed a bug in IntervalEvaluator.

File:

• branches/2994-AutoDiffForIntervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/Interpreter.cs (modified) (4 diffs)

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

@@ -788 +788 @@
     [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     public AlgebraicInterval Zero => new AlgebraicInterval(0.0, 0.0);
+    [DebuggerBrowsable(DebuggerBrowsableState.Never)]
     public AlgebraicInterval One => new AlgebraicInterval(1.0, 1.0);
+
     public AlgebraicInterval Add(AlgebraicInterval a) {
       low.Add(a.low);
@@ -818 +820 @@
     public AlgebraicInterval Div(AlgebraicInterval a) {
       if (a.Contains(0.0)) {
-        if (a.low.Value.Value.IsAlmost(0.0) && a.high.Value.Value.IsAlmost(0.0)) {
+        if (a.low.Value.Value == 0 && a.high.Value.Value == 0) {
           low = new MultivariateDual<AlgebraicDouble>(double.NegativeInfinity);
           high = new MultivariateDual<AlgebraicDouble>(double.PositiveInfinity);
-        } else if (a.low.Value.Value.IsAlmost(0.0))
+        } else if (a.low.Value.Value == 0)
           Mul(new AlgebraicInterval(a.Clone().high.Inv(), new MultivariateDual<AlgebraicDouble>(double.PositiveInfinity)));
         else
@@ -945 +947 @@
       //divide the interval by PI/2 so that the optima lie at x element of N (0,1,2,3,4,...)
       double Pihalf = Math.PI / 2;
-      var scaled = this.Clone().Scale(1.0 / Pihalf);
+      var scaled = a.Clone().Scale(1.0 / Pihalf);
       //move to positive scale
       if (scaled.LowerBound.Value.Value < 0) {
@@ -965 +967 @@
       }
 
-      low = new MultivariateDual<AlgebraicDouble>(sinValues.Min());
+      low = new MultivariateDual<AlgebraicDouble>(sinValues.Min()); // TODO, XXX FIX CALCULATION TO SUPPORT GRADIENTS!
       high = new MultivariateDual<AlgebraicDouble>(sinValues.Max());
       return this;