Changeset 17370 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis

Timestamp:

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

Author:

chaider

Message:

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

Location:

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4

Files:

• Implementation/Interval/Interval.cs (modified) (1 diff)
• Implementation/Interval/IntervalConstraint.cs (modified) (6 diffs)
• Implementation/Interval/IntervalConstraintsParser.cs (modified) (5 diffs)
• ProblemDataConstraint.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;
     }
 

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;

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

@@ -33 +33 @@
       if (string.IsNullOrEmpty(target)) throw new ArgumentNullException("No target variable has been provided.");
       if (variables == null) throw new ArgumentNullException("No variables have been provided.");
-      if (!variables.Any()) throw new ArgumentException("Varialbes are empty.");
+      if (!variables.Any()) throw new ArgumentException("Variables are empty.");
 
       var lines = inputText.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.None);
@@ -44 +44 @@
           var targetConstraint = trimmedLine.Substring(start, end - start);
           var match = Regex.Match(targetConstraint,
-            @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
+            @"(['](.*)[']|(.*[^\s]))\s*(\bin\b)\s*([\[])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\]])");
           if (match.Success) {
             if (match.Groups.Count != 10) {
@@ -63 +63 @@
               var parsedTarget = match.Groups[1].Value.Trim();
               var variable = targetVariable;
-              var inclLowerBound = match.Groups[5].Value.Trim() == "[";
-              var inclUpperBound = match.Groups[9].Value.Trim() == "]";
               var isEnabled = true;
               var numberOfDerivation = 0;
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, isEnabled);
 
               yield return constraint;
@@ -79 +77 @@
         } else if (trimmedLine.StartsWith("d") || trimmedLine.StartsWith("\u2202")) {
           var match = Regex.Match(trimmedLine,
-            @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[\]])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\[\]])");
+            @"([d∂])([²³]?)\s*(['](.*)[']|(.*[^\s]))\s*(\/)\s*([d∂])\s*(['](.*)[']|(.*[^\s²³]))\s*([²³]?)\s*\bin\b\s*([\[])\s*(\S*)\s*(\.{2})\s*(\S*)\s*([\]])");
 
           if (match.Success) {
@@ -115 +113 @@
               var parsedTarget = derivationTarget;
               var isEnabled = true;
-              var inclLowerBound = match.Groups[12].Value.Trim() == "[";
-              var inclUpperBound = match.Groups[16].Value.Trim() == "]";
               var variable = derivationVariable;
               var numberOfDerivation = ParseDerivationCount(match.Groups[2].Value.Trim());
               var interval = new Interval(lowerBound, upperBound);
 
-              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, inclLowerBound, inclUpperBound, isEnabled);
+              var constraint = new IntervalConstraint(expression, variable, parsedTarget, numberOfDerivation, interval, isEnabled);
 
               yield return constraint;

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/ProblemDataConstraint.cs

@@ -37 +37 @@
                                                   "# Example for constraint on model parameter: " + Environment.NewLine +
                                                   "d'y'/d'x' in [0 .. 10]" + Environment.NewLine +
-                                                  "∂²'y'/∂'x'² in ]-1 .. inf.[";
+                                                  "∂²'y'/∂'x'² in [-1 .. inf.]";
 
     [Storable]