Changeset 17217

Timestamp:

08/13/19 19:05:35 (5 years ago)

Author:

gkronber

Message:

#2994: more test cases to understand specific problems when optimizing with constraints

Location:

branches/2994-AutoDiffForIntervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/AutoDiffIntervalInterpreterTest.cs (modified) (3 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/DeriveTest.cs (modified) (1 diff)

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

@@ -247 +247 @@
             break;
           }
+        case OpCodes.Cube: {
+            var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            result = Interval.Cube(argumentInterval);
+            break;
+          }
         case OpCodes.Root: {
             result = Evaluate(instructions, ref instructionCounter, nodeIntervals);
@@ -258 +263 @@
             var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
             result = Interval.SquareRoot(argumentInterval);
+            break;
+          }
+        case OpCodes.CubeRoot: {
+            var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            result = Interval.CubicRoot(argumentInterval);
             break;
           }

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

@@ -40 +40 @@
     }
 
-    private void EvaluateTest(string expression, Interval expectedResult, IDictionary<string, Interval> variableRanges = null, double lowerDelta = 0, double upperDelta = 0) {
+    private void EvaluateTest(string expression, Interval expectedResult, IDictionary<string, Interval> variableRanges = null, double lowerDelta = 1e-6, double upperDelta = 1e-6) {
       var parser = new InfixExpressionParser();
       var tree = parser.Parse(expression);
@@ -105 +105 @@
       EvaluateTest("cos(x1+x2)", new Interval(-1, 1));
       EvaluateTest("cos(x1+x2)", new Interval(-1, 1), variableRanges);
-      EvaluateTest("cos(1+2)", new Interval(Math.Sin(3 + Math.PI / 2), Math.Sin(3 + Math.PI / 2)));
+      EvaluateTest("cos(1+2)", new Interval(Math.Cos(3), Math.Cos(3)));
 
       var localVarRanges = new Dictionary<string, Interval>();
@@ -182 +182 @@
       EvaluateTest("sqr(x)", new Interval(Math.Pow(3, 2), Math.Pow(8, 2)));
     }
+
+
+
+    [TestMethod]
+    [TestCategory("Problems.DataAnalysis")]
+    [TestProperty("Time", "short")]
+    public void TestDivisionAndSqr() {
+      Dictionary<string, Interval> dataIntervals = new Dictionary<string, Interval>() {
+        {"R", new Interval(0.2, 0.5) },
+        {"r", new Interval(0.5, 0.8) },
+      };
+
+      EvaluateTest("R*R", new Interval(0.2 * 0.2, 0.5 * 0.5), dataIntervals);
+      EvaluateTest("sqr(R)", new Interval(0.2 * 0.2, 0.5 * 0.5), dataIntervals);
+
+      EvaluateTest("r*r", new Interval(0.5 * 0.5, 0.8 * 0.8), dataIntervals);
+      EvaluateTest("sqr(r)", new Interval(0.5 * 0.5, 0.8 * 0.8), dataIntervals);
+
+      EvaluateTest("R/r", new Interval(0.2 / 0.8, 0.5 / 0.5), dataIntervals);
+
+      EvaluateTest("R/(r*r)", new Interval(0.2 / (0.8 * 0.8), 0.5 / (0.5 * 0.5)), dataIntervals);
+      EvaluateTest("R/sqr(r)", new Interval(0.2 / (0.8 * 0.8), 0.5 / (0.5 * 0.5)), dataIntervals);
+
+      EvaluateTest("R*R/sqr(r)", new Interval(0.2 * 0.2 / (0.8 * 0.8), 0.5 * 0.5 / (0.5 * 0.5)), dataIntervals);
+      EvaluateTest("sqr(R)/sqr(r)", new Interval(0.2 * 0.2 / (0.8 * 0.8), 0.5 * 0.5 / (0.5 * 0.5)), dataIntervals);
+      EvaluateTest("sqr(R/r)", new Interval(0.2 * 0.2 / (0.8 * 0.8), 0.5 * 0.5 / (0.5 * 0.5)), dataIntervals);
+    }
   }
 }

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

@@ -134 +134 @@
           formatter.Format(DerivativeCalculator.Derive(t, "z")));
       }
+
+      // more cases from applications 
+      Assert.AreEqual("(2*'R')", Derive("R*R", "R"));
+      Assert.AreEqual("(2*'r')", Derive("sqr(r)", "r"));
+
+      Assert.AreEqual("('R' / (SQR('r') * (-1)))", Derive("R/r", "r"));
+      Assert.AreEqual("(('r' * 'R' * (-2)) / (SQR('r') * SQR('r')))", Derive("R/(r*r)", "r"));
+      Assert.AreEqual("(('r' * 'R' * (-2)) / SQR(SQR('r')))", Derive("R/sqr(r)", "r"));
+
+      Assert.AreEqual("(('r' * ('R' * 'R') * (-2)) / SQR(SQR('r')))", Derive("R*R/sqr(r)", "r"));
+      Assert.AreEqual("(('r' * SQR('R') * (-2)) / SQR(SQR('r')))", Derive("sqr(R)/sqr(r)", "r"));
+      Assert.AreEqual("((('R' * 'R') * 2) / ('r' * SQR('r') * (-1)))", Derive("sqr(R/r)", "r"));
+      Assert.AreEqual("((('R' * 'R') / ('r' * SQR('r') * (-1))) + (('R' * 'R') / ('r' * SQR('r') * (-1))))", Derive("(R/r)*(R/r)", "r"));
     }