Changeset 17370 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

Timestamp:

11/25/19 13:39:43 (4 years ago)

Author:

chaider

Message:

#2971 Removed the possibility of declaring open and closed intervals. All intervals are closed intervals now.

File:

• branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs (modified) (1 diff)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

@@ -71 +71 @@
     }
 
-    public bool Contains(Interval other, bool lowerBoundInclusive = true, bool upperBoundInclusive = false) {
-      if (double.IsNegativeInfinity(this.LowerBound) && double.IsPositiveInfinity(this.UpperBound))
-        return true;
-      //Left-unbounded and right-bounded:
-      if (double.IsNegativeInfinity(this.LowerBound)) {
-        if (upperBoundInclusive)
-          return other.LowerBound <= this.UpperBound && other.UpperBound <= this.UpperBound;
-        return other.LowerBound < this.UpperBound && other.UpperBound < this.UpperBound;
-      }
-
-      //Left-bounded and right-unbounded:
-      if (double.IsPositiveInfinity(this.UpperBound)) {
-        if (lowerBoundInclusive)
-          return other.LowerBound >= this.LowerBound && other.UpperBound >= this.LowerBound;
-        return other.LowerBound > this.LowerBound && other.UpperBound > this.LowerBound;
-      }
-
-      //Proper and bounded:
-      //Closed:
-      if (lowerBoundInclusive && upperBoundInclusive) {
-        return this.LowerBound <= other.LowerBound && other.UpperBound <= this.UpperBound;
-      }
-
-      //Open:
-      if (!lowerBoundInclusive && !upperBoundInclusive) {
-        return this.LowerBound < other.LowerBound && other.UpperBound < this.UpperBound;
-      }
-
-      //Left-closed, right-open:
-      if (lowerBoundInclusive) {
-        return this.LowerBound <= other.LowerBound && other.UpperBound < this.UpperBound;
-      }
-
-      //Left-open, right-closed:
-      return this.LowerBound < other.LowerBound && other.UpperBound <= this.UpperBound;
+    public bool Contains(Interval other) {
+      if (double.IsNegativeInfinity(LowerBound) && double.IsPositiveInfinity(UpperBound)) return true;
+      if (other.LowerBound >= LowerBound && other.UpperBound <= UpperBound) return true;
+  
+      return false;
     }