Changeset 16591 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators

Timestamp:

02/06/19 14:41:06 (6 years ago)

Author:

chaider

Message:

#2971 Fixed checking if a given interval is in another interval

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs (modified) (3 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionSingleObjectiveConstraintPearsonRSquaredEvaluator.cs

@@ -51 +51 @@
       double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows, ApplyLinearScalingParameter.ActualValue.Value);
       QualityParameter.ActualValue = new DoubleValue(quality);
-
       return base.InstrumentedApply();
     }
@@ -67 +66 @@
 
       foreach (var constraint in constraints) {
-        if (!variableRanges.ContainsKey(constraint.Variable))
+        if (constraint.Variable != null && !variableRanges.ContainsKey(constraint.Variable))
           throw new ArgumentException($"The given variable {constraint.Variable} in the constraint does not exists in the model.", nameof(IntervalConstraintsParser));
         if (!constraint.IsDerivation) {
@@ -118 +117 @@
 
     private static bool IntervalInBoundaries(Interval i1, Interval i2, bool inclusiveLower, bool inclusiveUpper) {
-      if (inclusiveLower) {
-        if (i2.LowerBound < i1.LowerBound)
-          return false;
-      } else {
-        if (i2.LowerBound <= i1.LowerBound)
-          return false;
+      if (double.IsNegativeInfinity(i1.LowerBound) && double.IsPositiveInfinity(i1.UpperBound))
+        return true;
+      //Left-unbounded and right-bounded:
+      if (double.IsNegativeInfinity(i1.LowerBound)) {
+        if (inclusiveUpper)
+          return i2.LowerBound <= i1.UpperBound && i2.UpperBound <= i1.UpperBound;
+        return i2.LowerBound < i1.UpperBound && i2.UpperBound < i1.UpperBound;
       }
 
-      if (inclusiveUpper) {
-        if (i2.UpperBound > i1.UpperBound)
-          return false;
-      } else {
-        if (i2.UpperBound >= i1.UpperBound)
-          return false;
+      //Left-bounded and right-unbounded:
+      if (double.IsPositiveInfinity(i1.UpperBound)) {
+        if (inclusiveLower)
+          return i2.LowerBound >= i1.LowerBound && i2.UpperBound >= i1.LowerBound;
+        return i2.LowerBound > i1.LowerBound && i2.UpperBound > i1.LowerBound;
       }
 
-      return true;
+      //Proper and bounded:
+      //Closed:
+      if (inclusiveLower && inclusiveUpper) { 
+        return i1.LowerBound <= i2.LowerBound && i2.UpperBound <= i1.UpperBound;
+      }
+      //Open:
+      if (!inclusiveLower && !inclusiveUpper) {
+        return i1.LowerBound < i2.LowerBound && i2.UpperBound < i1.UpperBound;
+      }
+      //Left-closed, right-open:
+      if (inclusiveLower) {
+        return i1.LowerBound <= i2.LowerBound && i2.UpperBound < i1.UpperBound;
+      }
+      //Left-open, right-closed:
+      return i1.LowerBound < i2.LowerBound && i2.UpperBound <= i1.UpperBound;
     }
   }