Changeset 17993 for trunk

Timestamp:

06/17/21 08:23:50 (3 years ago)

Author:

gkronber

Message:

#3073: changed compatibility check for IntervalInterpreter to be more specific for integer powers (see r17780)

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (3 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -287 +287 @@
             var b = Evaluate(instructions, ref instructionCounter, nodeIntervals, variableIntervals);
             // support only integer powers
-            if(b.LowerBound == b.UpperBound && Math.Truncate(b.LowerBound) == b.LowerBound) {
+            if (b.LowerBound == b.UpperBound && Math.Truncate(b.LowerBound) == b.LowerBound) {
               result = Interval.Power(a, (int)b.LowerBound);
             } else {
@@ -321 +321 @@
 
     public static bool IsCompatible(ISymbolicExpressionTree tree) {
-      var containsUnknownSymbols = (
-        from n in tree.Root.GetSubtree(0).IterateNodesPrefix()
-        where
+      foreach (var n in tree.Root.GetSubtree(0).IterateNodesPrefix()) {
+        if (
           !(n.Symbol is Variable) &&
           !(n.Symbol is Constant) &&
@@ -343 +342 @@
           !(n.Symbol is Power) &&
           !(n.Symbol is Absolute) &&
-          !(n.Symbol is AnalyticQuotient)
-        select n).Any();
-      return !containsUnknownSymbols;
+          !(n.Symbol is AnalyticQuotient)) return false;
+
+        else if (n.Symbol is Power) {
+          // only integer exponents are supported
+          var exp = n.GetSubtree(1) as ConstantTreeNode;
+          if (exp == null || exp.Value != Math.Truncate(exp.Value)) return false;
+        }
+      }
+      return true;
     }
   }