Changeset 18022 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs

Timestamp:

07/17/21 19:04:42 (3 years ago)

Author:

gkronber

Message:

#3125: merged r17976,r17978,r18020 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs (modified) (4 diffs)

stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionErrorCharacteristicsCurveView.cs

@@ -26 +26 @@
 using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.MainForm;
+using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.DataAnalysis.Views;
 
@@ -43 +44 @@
     private IRegressionSolution CreateLinearRegressionSolution() {
       if (Content == null) throw new InvalidOperationException();
-      double rmse, cvRmsError;
       var problemData = (IRegressionProblemData)ProblemData.Clone();
       if (!problemData.TrainingIndices.Any()) return null; // don't create an LR model if the problem does not have a training set (e.g. loaded into an existing model)
@@ -87 +87 @@
       newProblemData.TestPartition.End = problemData.TestPartition.End;
 
-      var solution = LinearRegression.CreateLinearRegressionSolution(newProblemData, out rmse, out cvRmsError);
-      solution.Name = "Baseline (linear subset)";
-      return solution;
+      try {
+        var solution = LinearRegression.CreateSolution(newProblemData, out _, out _);
+        solution.Name = "Baseline (linear subset)";
+        return solution;
+      } catch (NotSupportedException e) {
+        ErrorHandling.ShowErrorDialog("Could not create a linear regression solution.", e);
+      } catch (ArgumentException e) {
+        ErrorHandling.ShowErrorDialog("Could not create a linear regression solution.", e);
+      }
+      return null;
     }
 
@@ -99 +106 @@
       if (Content.Model.SymbolicExpressionTree.IterateNodesPrefix().OfType<LaggedVariableTreeNode>().Any()) yield break;
 
-      yield return CreateLinearRegressionSolution();
+      var linearRegressionSolution = CreateLinearRegressionSolution();
+      if (linearRegressionSolution != null) yield return linearRegressionSolution;
     }
   }