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

Timestamp:

02/06/19 16:16:50 (6 years ago)

Author:

chaider

Message:

#2971

• Added ContainsInterval method in Interval
• Some renaming
• Added ConstraintAnalyzer to SymbolicRegressionProblem
• Added Counter for constraint violations in analyzer

Location:

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

Files:

• Interval.cs (modified) (1 diff)
• Parser/IntervalConstraint.cs (modified) (1 diff)
• Parser/IntervalConstraintsParser.cs (modified) (1 diff)
• Regression/RegressionProblemData.cs (modified) (1 diff)

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

@@ -43 +43 @@
     public bool Contains(double value) {
       return LowerBound <= value && value <= UpperBound;
+    }
+
+    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;
     }
 

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

@@ -7 +7 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public class IntervalConstraint {
-    public string Derivaiton { get; set; }
+    public string Expression { get; set; }
     public string Definition { get; set; }
     public Interval Interval { get; set; }

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

@@ -40 +40 @@
             intervalConstraint.IsDerivation = false;
           }
-          intervalConstraint.Derivaiton = matches[i].Groups[0].Value;
+          intervalConstraint.Expression = matches[i].Groups[0].Value;
           intervalConstraint.InclusiveLowerBound = (matches[i].Groups[2].Value == "[");
           intervalConstraint.InclusiveUpperBound = (matches[i].Groups[6].Value == "]");

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblemData.cs

@@ -105 +105 @@
     }
 
-    public IFixedValueParameter<NamedIntervals> VariableRangesParameter {
-      get { return (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName]; }
-    }
+    public IFixedValueParameter<NamedIntervals> VariableRangesParameter => (IFixedValueParameter<NamedIntervals>)Parameters[VariableRangesParameterName];
+
+    public NamedIntervals VariableRanges => VariableRangesParameter.Value;
 
     public IFixedValueParameter<TextValue> IntervalConstraintsParameter => (IFixedValueParameter<TextValue>) Parameters[IntervalConstraintsParameterName];
+    public TextValue IntervalConstraints => IntervalConstraintsParameter.Value;
 
     public string TargetVariable {