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

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

File:

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

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

@@ -70 +70 @@
         if (!constraint.IsDerivation) {
           var res = intervalInterpreter.GetSymbolicExressionTreeInterval(solution, variableRanges);
-          if (!IntervalInBoundaries(constraint.Interval, res, constraint.InclusiveLowerBound,
+          if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {
             return 0;
@@ -80 +80 @@
           }
           var res = intervalInterpreter.GetSymbolicExressionTreeInterval(tree, variableRanges);
-          if (!IntervalInBoundaries(constraint.Interval, res, constraint.InclusiveLowerBound,
+          if (!constraint.Interval.Contains(res, constraint.InclusiveLowerBound,
             constraint.InclusiveUpperBound)) {
             return 0;
@@ -86 +86 @@
         }
       }
+      // TODO
+      // m = new SymbolicRegressionModel(...)
+      // m.Scale();
+
+      // var e = m.GetEstimatedValues (TRAINING)
+      // OnlinePearsonCalc.Calculate(e, TARGET_TRAIING)
+      
+      // scaledTree = model.Tree;
+
+      // constraints mit scaledTree berechnen (auch die Ableitungen)
+
 
 
@@ -102 +113 @@
     }
 
-    public override double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree, IRegressionProblemData problemData, IEnumerable<int> rows) {
+    public override double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree,
+      IRegressionProblemData problemData, IEnumerable<int> rows) {
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
       EstimationLimitsParameter.ExecutionContext = context;
       ApplyLinearScalingParameter.ExecutionContext = context;
 
-      double r2 = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows, ApplyLinearScalingParameter.ActualValue.Value);
+      double r2 = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree,
+        EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows,
+        ApplyLinearScalingParameter.ActualValue.Value);
 
       SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
@@ -115 +129 @@
       return r2;
     }
-
-    private static bool IntervalInBoundaries(Interval i1, Interval i2, bool inclusiveLower, bool inclusiveUpper) {
-      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;
-      }
-
-      //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;
-      }
-
-      //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;
-    }
   }
 }