Changeset 17906 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

03/16/21 15:26:50 (4 years ago)

Author:

gkronber

Message:

#3073 bugfixing

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Interpreter/IntervalArithCompiledExpressionBoundsEstimator.cs (modified) (2 diffs)
• IntervalUtil.cs (modified) (1 diff)

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

@@ -194 +194 @@
             return Expression.Divide(e1, e2);
           }
+        case OpCodes.AnalyticQuotient: {
+            var a = expr(node.GetSubtree(0));
+            var b = expr(node.GetSubtree(1));
+            var fun = typeof(Interval).GetMethod(methodName[opCode], new[] { a.Type, b.Type });
+            return Expression.Call(fun, a, b);
+          }
         // all these cases share the same code: get method info by name, emit call expression
         case OpCodes.Exp:
@@ -205 +211 @@
         case OpCodes.SquareRoot:
         case OpCodes.CubeRoot:
-        case OpCodes.Absolute:
-        case OpCodes.AnalyticQuotient: {
+        case OpCodes.Absolute: {
             var arg = expr(node.GetSubtree(0));
             var fun = typeof(Interval).GetMethod(methodName[opCode], new[] { arg.Type });

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/IntervalUtil.cs

@@ -39 +39 @@
       var varRanges = variableRanges.GetReadonlyDictionary();
 
-      if (constraint.Variable != null && !varRanges.ContainsKey(constraint.Variable)) {
+      if (!string.IsNullOrEmpty(constraint.Variable) && !varRanges.ContainsKey(constraint.Variable)) {
         throw new ArgumentException(
-          $"The given variable {constraint.Variable} in the constraint does not exist in the model.",
+          $"No variable range found for variable {constraint.Variable} used in the constraints.",
           nameof(constraint));
       }