Changeset 16627

Timestamp:

02/28/19 12:40:15 (6 years ago)

Author:

gkronber

Message:

#2971: fixed update of interval results when solution changes (e.g. in the simplifier)

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionSolution.cs (modified) (8 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs (modified) (3 diffs)

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

@@ -29 +29 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis.Implementation;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
@@ -34 +35 @@
   /// Represents a symbolic regression solution (model + data) and attributes of the solution like accuracy and complexity
   /// </summary>
-  [StorableClass]
+  [StorableType("CC27F20C-5925-406B-9C38-3C4B2B781C9F")]
   [Item(Name = "SymbolicRegressionSolution", Description = "Represents a symbolic regression solution (model + data) and attributes of the solution like accuracy and complexity.")]
   public sealed class SymbolicRegressionSolution : RegressionSolution, ISymbolicRegressionSolution {
@@ -101 +102 @@
     }
 
-    private NamedIntervals IntervalEvaluaitonCollection => 
-      (NamedIntervals) this[IntervalEvaluationResultName].Value;
+
+    public NamedIntervals IntervalEvaluationCollection {
+      get { return (NamedIntervals)this[IntervalEvaluationResultName].Value; }
+      private set { this[IntervalEvaluationResultName].Value = value; }
+    }
 
 
 
     [StorableConstructor]
-    private SymbolicRegressionSolution(bool deserializing) : base(deserializing) { }
+    private SymbolicRegressionSolution(StorableConstructorFlag _) : base(_) { }
     private SymbolicRegressionSolution(SymbolicRegressionSolution original, Cloner cloner)
       : base(original, cloner) {
@@ -130 +134 @@
       RecalculateResults();
 
-      var namedIntervalCollection = new NamedIntervals();
-      Add(new Result(IntervalEvaluationResultName, "Results concerning the derivation of symbolic regression solution", namedIntervalCollection));
-      GetIntervalEvaulations(namedIntervalCollection);
+      Add(new Result(IntervalEvaluationResultName, "Results concerning the derivation of symbolic regression solution", GetIntervalEvaluations()));
+      ;
     }
 
@@ -152 +155 @@
         Add(new Result(EstimationLimitsResultsResultName, "Results concerning the estimation limits of symbolic regression solution", estimationLimitResults));
         CalculateResults();
-
-        var namedIntervalCollection = new NamedIntervals();
-        Add(new Result(IntervalEvaluationResultName, "Results concerning the derivation of symbolic regression solution", namedIntervalCollection));
-        GetIntervalEvaulations(namedIntervalCollection);
       }
     }
@@ -164 +163 @@
     }
 
-    private void GetIntervalEvaulations(NamedIntervals intervalEvaluation) {
+    private NamedIntervals GetIntervalEvaluations() {
+      var intervalEvaluation = new NamedIntervals();
       var interpreter = new IntervalInterpreter();
       var variableRanges = (ProblemData as RegressionProblemData)?.VariableRangesParameter.Value.VariableIntervals;
@@ -181 +181 @@
         }
       }
+      return intervalEvaluation;
     }
     
@@ -196 +197 @@
       TrainingNaNEvaluations = Model.Interpreter.GetSymbolicExpressionTreeValues(Model.SymbolicExpressionTree, ProblemData.Dataset, ProblemData.TrainingIndices).Count(double.IsNaN);
       TestNaNEvaluations = Model.Interpreter.GetSymbolicExpressionTreeValues(Model.SymbolicExpressionTree, ProblemData.Dataset, ProblemData.TestIndices).Count(double.IsNaN);
+
+      IntervalEvaluationCollection = GetIntervalEvaluations();
     }
   }

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/NamedIntervalsView.cs

@@ -47 +47 @@
     public NamedIntervalsView() {
       InitializeComponent();
-      setColumnNames();
       dataGridView.AutoGenerateColumns = false;
       dataGridView.AllowUserToAddRows = false;
@@ -69 +68 @@
 
     protected void UpdateData() {
+      DataGridView.Rows.Clear();
+      DataGridView.Columns.Clear();
+      SetColumnNames();
+
+
       var variablesCount = Content.VariableIntervals.Count;
 
@@ -102 +106 @@
     }
 
-    protected void setColumnNames() {
+    protected void SetColumnNames() {
       dataGridView.Columns.Add("lowerBound", "Lower Bound");
       dataGridView.Columns.Add("upperBound", "Upper Bound");