Changeset 17509 for branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

Timestamp:

04/14/20 12:00:47 (5 years ago)

Author:

chaider

Message:

#2971:

• Added cube, cuberoot, absolute and analytical quotient to IntervalInterpreter
• Extended the IsCompatible method in IntervalInterpreter (removed power, root because not implemented in DerivativeCalculator
• Added checks for known symbols at InteractiveSymbolicDataAnalysisSolutionSimplifierView and SymbolicRegressionSolution

File:

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

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs

@@ -47 +47 @@
     private const string TestNaNEvaluationsResultName = "Test NaN Evaluations";
 
-    private const string IntervalEvaluationResultName = "Interval Evaluation";
+    private const string ModelBoundsResultName = "Model Bounds";
 
     public new ISymbolicRegressionModel Model {
@@ -98 +98 @@
     }
 
-    public IntervalCollection IntervalEvaluationCollection {
-      get { return (IntervalCollection)this[IntervalEvaluationResultName].Value; }
-      private set { this[IntervalEvaluationResultName].Value = value; }
+    public IntervalCollection ModelBoundsCollection {
+      get { return (IntervalCollection)this[ModelBoundsResultName].Value; }
+      private set { this[ModelBoundsResultName].Value = value; }
     }
 
@@ -127 +127 @@
       estimationLimitResults.Add(new Result(TestNaNEvaluationsResultName, "", new IntValue()));
       Add(new Result(EstimationLimitsResultsResultName, "Results concerning the estimation limits of symbolic regression solution", estimationLimitResults));
-      Add(new Result(IntervalEvaluationResultName, "Results concerning the derivation of symbolic regression solution", new IntervalCollection()));
+      Add(new Result(ModelBoundsResultName, "Results concerning the derivation of symbolic regression solution", new IntervalCollection()));
       RecalculateResults();
     }
@@ -147 +147 @@
         estimationLimitResults.Add(new Result(TestNaNEvaluationsResultName, "", new IntValue()));
         Add(new Result(EstimationLimitsResultsResultName, "Results concerning the estimation limits of symbolic regression solution", estimationLimitResults));
-        Add(new Result(IntervalEvaluationResultName, "Results concerning the derivation of symbolic regression solution", new IntervalCollection()));
+        CalculateResults();
+      }
+
+      if (!ContainsKey(ModelBoundsResultName)) {
+        Add(new Result(ModelBoundsResultName, "Results concerning the derivation of symbolic regression solution", new IntervalCollection()));
         CalculateResults();
       }
@@ -171 +175 @@
       TestNaNEvaluations = Model.Interpreter.GetSymbolicExpressionTreeValues(Model.SymbolicExpressionTree, ProblemData.Dataset, ProblemData.TestIndices).Count(double.IsNaN);
 
-      IntervalEvaluationCollection = CalculateModelIntervals(this);
+      //Check if the tree contains unknown symbols for the interval calculation
+      if (IntervalInterpreter.IsCompatible(Model.SymbolicExpressionTree))
+        ModelBoundsCollection = CalculateModelIntervals(this);
     }