Changeset 17773 for branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter

Timestamp:

10/08/20 15:39:46 (4 years ago)

Author:

chaider

Message:

#3073 Fixed error calculation in IABoundsEstimator

File:

• branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IABoundsEstimator.cs (modified) (1 diff)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IABoundsEstimator.cs

@@ -474 +474 @@
         var modelBound = Evaluate(instructions, ref instructionCounter, variableIntervals: occuringVariableRanges);
         if (constraint.Interval.Contains(modelBound)) return 0.0;
-        return Math.Abs(modelBound.LowerBound - constraint.Interval.LowerBound) +
-               Math.Abs(modelBound.UpperBound - constraint.Interval.UpperBound);
+
+
+        var error = 0.0;
+
+        if (!constraint.Interval.Contains(modelBound.LowerBound)) {
+            error += Math.Abs(modelBound.LowerBound - constraint.Interval.LowerBound);
+        }
+
+        if (!constraint.Interval.Contains(modelBound.UpperBound)) {
+            error += Math.Abs(modelBound.UpperBound - constraint.Interval.UpperBound);
+        }
+
+        return error;
+        // return Math.Abs(modelBound.LowerBound - constraint.Interval.LowerBound) +
+        //Math.Abs(modelBound.UpperBound - constraint.Interval.UpperBound);
       }