Changeset 18022 for stable

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)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4 (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (9 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;
     }
   }

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -563 +563 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4.csproj">
-      <Project>{5AC82412-911B-4FA2-A013-EDC5E3F3FCC2}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic.Regression-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Symbolic\3.4\HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj">
-      <Project>{3D28463F-EC96-4D82-AFEE-38BE91A0CA00}</Project>
-      <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{DF87C13E-A889-46FF-8153-66DCAA8C5674}</Project>

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Plugin.cs.frame

@@ -45 +45 @@
   [PluginDependency("HeuristicLab.Optimizer", "3.3")]
   [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")]
-  [PluginDependency("HeuristicLab.Problems.DataAnalysis.Symbolic.Regression", "3.4")]
   [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")]
   public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase {

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -29 +29 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.Optimization;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -74 +75 @@
     }
 
-    private readonly IList<IRegressionSolution> solutions = new List<IRegressionSolution>();
+    private readonly List<IRegressionSolution> solutions = new List<IRegressionSolution>();
     public IEnumerable<IRegressionSolution> Solutions {
       get { return solutions.AsEnumerable(); }
@@ -101 +102 @@
       else {
         // recalculate baseline solutions (for symbolic regression models the features used in the model might have changed)
-        solutions.Clear(); // remove all
+        solutions.Clear();
         solutions.Add(Content); // re-add the first solution
-        // and recalculate all other solutions
-        foreach (var sol in CreateBaselineSolutions()) {
-          solutions.Add(sol);
-        }
+        solutions.AddRange(CreateBaselineSolutions());
         UpdateChart();
       }
@@ -114 +112 @@
       else {
         // recalculate baseline solutions
-        solutions.Clear(); // remove all
+        solutions.Clear();
         solutions.Add(Content); // re-add the first solution
-        // and recalculate all other solutions
-        foreach (var sol in CreateBaselineSolutions()) {
-          solutions.Add(sol);
-        }
+        solutions.AddRange(CreateBaselineSolutions());
         UpdateChart();
       }
@@ -129 +124 @@
       ReadOnly = Content == null;
       if (Content != null) {
-        // recalculate all solutions
         solutions.Add(Content);
-        if (ProblemData.TrainingIndices.Any()) {
-          foreach (var sol in CreateBaselineSolutions())
-            solutions.Add(sol);
-          // more solutions can be added by drag&drop
-        }
+        solutions.AddRange(CreateBaselineSolutions());
       }
       UpdateChart();
@@ -175 +165 @@
       UpdateSeries(residuals, solutionSeries);
 
-      solutionSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(solutionSeries);
+      solutionSeries.ToolTip = "Area over curve: " + CalculateAreaOverCurve(solutionSeries);
       solutionSeries.LegendToolTip = "Double-click to open model";
       chart.Series.Add(solutionSeries);
@@ -249 +239 @@
     protected virtual List<double> GetResiduals(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues) {
       switch (residualComboBox.SelectedItem.ToString()) {
-        case "Absolute error": return originalValues.Zip(estimatedValues, (x, y) => Math.Abs(x - y))
+        case "Absolute error":
+          return originalValues.Zip(estimatedValues, (x, y) => Math.Abs(x - y))
             .Where(r => !double.IsNaN(r) && !double.IsInfinity(r)).ToList();
-        case "Squared error": return originalValues.Zip(estimatedValues, (x, y) => (x - y) * (x - y))
+        case "Squared error":
+          return originalValues.Zip(estimatedValues, (x, y) => (x - y) * (x - y))
             .Where(r => !double.IsNaN(r) && !double.IsInfinity(r)).ToList();
         case "Relative error":
@@ -289 +281 @@
 
     protected virtual IEnumerable<IRegressionSolution> CreateBaselineSolutions() {
-      yield return CreateConstantSolution();
-      yield return CreateLinearSolution();
+      var constantSolution = CreateConstantSolution();
+      if (constantSolution != null) yield return constantSolution;
+
+      var linearRegressionSolution = CreateLinearSolution();
+      if (linearRegressionSolution != null) yield return linearRegressionSolution;
     }
 
     private IRegressionSolution CreateConstantSolution() {
+      if (!ProblemData.TrainingIndices.Any()) return null;
+
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).Average();
       var model = new ConstantModel(averageTrainingTarget, ProblemData.TargetVariable);
@@ -301 +298 @@
     }
     private IRegressionSolution CreateLinearSolution() {
-      double rmsError, cvRmsError;
-      var solution = LinearRegression.CreateLinearRegressionSolution((IRegressionProblemData)ProblemData.Clone(), out rmsError, out cvRmsError);
-      solution.Name = "Baseline (linear)";
-      return solution;
+      try {
+        var solution = LinearRegression.CreateSolution((IRegressionProblemData)ProblemData.Clone(), out _, out _);
+        solution.Name = "Baseline (linear)";
+        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;
     }