Changeset 17509 for branches

Timestamp:

04/14/20 12:00:47 (4 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

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (5 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (2 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);
     }
 

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -211 +211 @@
         }
 
-        var regressionProblemData = Content.ProblemData as IRegressionProblemData;
-        if (regressionProblemData != null) {
-          var interpreter = new IntervalInterpreter();
-          var variableRanges = regressionProblemData.VariableRanges.GetIntervals();
-          IDictionary<ISymbolicExpressionTreeNode, Interval> intervals;
-          interpreter.GetSymbolicExpressionTreeIntervals(tree, variableRanges, out intervals);
-          foreach (var kvp in intervals) {
-            nodeIntervals[kvp.Key] = kvp.Value;
+        if (IntervalInterpreter.IsCompatible(tree)) { 
+          var regressionProblemData = Content.ProblemData as IRegressionProblemData;
+          if (regressionProblemData != null) {
+            var interpreter = new IntervalInterpreter();
+            var variableRanges = regressionProblemData.VariableRanges.GetIntervals();
+            IDictionary<ISymbolicExpressionTreeNode, Interval> intervals;
+            interpreter.GetSymbolicExpressionTreeIntervals(tree, variableRanges, out intervals);
+            foreach (var kvp in intervals) {
+              nodeIntervals[kvp.Key] = kvp.Value;
+            }
           }
         }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -260 +260 @@
             break;
           }
+        case OpCodes.Cube: {
+            var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            result = Interval.Cube(argumentInterval);
+            break;
+          }
+        case OpCodes.CubeRoot: {
+            var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            result = Interval.CubicRoot(argumentInterval);
+            break;
+          }
+        case OpCodes.Absolute: {
+            var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            result = Interval.Absolute(argumentInterval);
+            break;
+          }
+        case OpCodes.AnalyticQuotient: {
+            result = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+            for (var i = 1; i < currentInstr.nArguments; i++) {
+              var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
+              result = Interval.AnalyticalQuotient(result, argumentInterval);
+            }
+
+            break;
+          }
         default:
           throw new NotSupportedException($"The tree contains the unknown symbol {currentInstr.dynamicNode.Symbol}");
@@ -284 +308 @@
           !(n.Symbol is Logarithm) &&
           !(n.Symbol is Exponential) &&
-          !(n.Symbol is Power) &&
+          //!(n.Symbol is Power) && //Interval Contains the symbol power, but the DerivativeCalculator does not!
           !(n.Symbol is Square) &&
-          !(n.Symbol is Root) &&
+          //!(n.Symbol is Root) && //Interval Contains the symbol root, but the DerivativeCalculator does not!
           !(n.Symbol is SquareRoot) &&
           !(n.Symbol is Problems.DataAnalysis.Symbolic.Variable) &&
-          !(n.Symbol is Constant)
+          !(n.Symbol is Constant) &&
+          !(n.Symbol is Cube) &&
+          !(n.Symbol is CubeRoot) &&
+          !(n.Symbol is Absolute) &&
+          !(n.Symbol is AnalyticQuotient)
         select n).Any();
       return !containsUnknownSyumbol;