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

Timestamp:

04/17/19 14:37:55 (5 years ago)

Author:

chaider

Message:

#2971 Several chanages regarding review comments

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

@@ -21 +21 @@
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -50 +52 @@
 
     private const string IntervalEvaluationResultName = "Interval Evaluation";
-    private const string EstimatedDerivationInterval = "Interval";
 
     public new ISymbolicRegressionModel Model {
@@ -151 +152 @@
         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", GetIntervalEvaluations()));
         CalculateResults();
       }
@@ -163 +165 @@
       var intervalEvaluation = new NamedIntervals();
       var interpreter = new IntervalInterpreter();
-      var variableRanges = (ProblemData as RegressionProblemData)?.VariableRangesParameter.Value.VariableIntervals;
+      var variableRanges = ProblemData.VariableRanges.VariableIntervals;
 
       if (variableRanges != null) {
-        intervalEvaluation.Add($"Target {ProblemData.TargetVariable}", new Interval(variableRanges[ProblemData.TargetVariable].LowerBound, variableRanges[ProblemData.TargetVariable].UpperBound));
-        intervalEvaluation.Add("Modell Interval", interpreter.GetSymbolicExpressionTreeInterval(Model.SymbolicExpressionTree, variableRanges));
+        intervalEvaluation.VariableIntervals.Add($"Target {ProblemData.TargetVariable}", new Interval(variableRanges[ProblemData.TargetVariable].LowerBound, variableRanges[ProblemData.TargetVariable].UpperBound));
+        intervalEvaluation.VariableIntervals.Add("Modell Interval", interpreter.GetSymbolicExpressionTreeInterval(Model.SymbolicExpressionTree, variableRanges));
      
         foreach (var derivate in variableRanges) {
@@ -174 +176 @@
             var derivedResultInterval = interpreter.GetSymbolicExpressionTreeInterval(derived, variableRanges);
 
-            intervalEvaluation.Add(" \u2202f/\u2202" + derivate.Key,
+            intervalEvaluation.VariableIntervals.Add(" \u2202f/\u2202" + derivate.Key,
               new Interval(derivedResultInterval.LowerBound, derivedResultInterval.UpperBound));
           }