Changeset 17370 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraint.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/IntervalConstraint.cs (modified) (6 diffs)

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

@@ -98 +98 @@
 
     [Storable]
-    private bool inclusiveLowerBound;
-    public bool InclusiveLowerBound {
-      get => inclusiveLowerBound;
-      set {
-        if (inclusiveLowerBound == value) return;
-        inclusiveLowerBound = value;
-        UpdateExpression();
-        OnChanged();
-      }
-    }
-
-    [Storable]
-    private bool inclusiveUpperBound;
-    public bool InclusiveUpperBound {
-      get => inclusiveUpperBound;
-      set {
-        if (inclusiveUpperBound == value) return;
-        inclusiveUpperBound = value;
-        UpdateExpression();
-        OnChanged();
-      }
-    }
-
-    [Storable]
     private bool enabled;
     public bool Enabled {
@@ -135 +111 @@
     private IntervalConstraint(StorableConstructorFlag _) : base(_) { }
 
-    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivation, Interval interval, bool inclusiveLowerBound,
-      bool inclusiveUpperBound, bool enabled) : base(){
+    public IntervalConstraint(string expression, string variable, string target, int numberOfDerivation, Interval interval, bool enabled) : base(){
       this.expression = expression;
       this.variable = variable;
@@ -142 +117 @@
       this.numberOfDerivation = numberOfDerivation;
       this.interval = interval;
-      this.inclusiveLowerBound = inclusiveLowerBound;
-      this.inclusiveUpperBound = inclusiveUpperBound;
       this.enabled = enabled;
     }
@@ -158 +131 @@
       this.NumberOfDerivation = original.NumberOfDerivation;
       this.Interval = original.Interval;
-      this.InclusiveLowerBound = original.InclusiveLowerBound;
-      this.InclusiveUpperBound = original.InclusiveUpperBound;
       this.Enabled = original.Enabled;
     }
@@ -189 +160 @@
         expression = string.Format("Target:{0} in {1}{2} .. {3}{4}",
           Variable,
-          (InclusiveLowerBound) ? "[" : "]",
+          "[",
           Interval?.LowerBound,
           Interval?.UpperBound,
-          (InclusiveUpperBound) ? "]" : "[");
+          "]");
         Expression = expression;
         return;
@@ -199 +170 @@
         Variable,
         Target,
-        (InclusiveLowerBound) ? "[" : "]",
+        "[",
         Interval?.LowerBound,
         Interval?.UpperBound,
-        (InclusiveUpperBound) ? "]" : "[",
+        "]",
         GetDerivationString(numberOfDerivation));
         Expression = expression;