Changeset 18208 for trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RunCollectionPartialDependencePlotView.cs

Timestamp:

01/24/22 21:45:48 (2 years ago)

Author:

gkronber

Message:

#3134: bugfixes and improvements

File:

• trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RunCollectionPartialDependencePlotView.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RunCollectionPartialDependencePlotView.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -20 +21 @@
     }
 
-    private static async void AddSolution(RegressionSolutionPartialDependencePlotView plot, IEnumerable<IRegressionSolution> solutions) {
-      foreach(var sol in solutions) {
-        await plot.AddSolution(sol);
+    protected override async void OnContentChanged() {
+      base.OnContentChanged();
+      if (Content == null) {
+        tabControl.TabPages.Clear();
+        return;
       }
-    }
+      // distinct names of results of types IRegressionSolution
+      var solutionResultNames = Content.SelectMany(run => run.Results.Where(kvp => kvp.Value is IRegressionSolution).Select(kvp => kvp.Key)).Distinct().ToArray();
 
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
+      foreach (var resultName in solutionResultNames) {
+        var tabPage = new TabPage(resultName);
+        tabControl.TabPages.Add(tabPage);
 
-      if (Content == null) return;
+        var solutions = new List<IRegressionSolution>();
+        foreach (var run in Content) {
+          // in experiments we may mix algorithms and therefore have different solution names in different runs
+          // we only combine solutions with the same name
+          if (run.Results.TryGetValue(resultName, out var sol) && sol is IRegressionSolution) {
+            solutions.Add((IRegressionSolution)sol);
+          }
+        }
+        var plot = new RegressionSolutionPartialDependencePlotView {
+          Content = solutions[0],
+          Dock = DockStyle.Fill
+        };
 
-      var solutions = Content.Select(run => (IRegressionSolution)run.Results["Best training solution"]).ToList();
-      var plot = new RegressionSolutionPartialDependencePlotView {
-        Content = solutions[0],
-        Dock = DockStyle.Fill
-      };
-
-      mainPanel.Controls.Add(plot);
-      AddSolution(plot, solutions);
+        tabPage.Controls.Add(plot);
+        for (int i = 1; i < solutions.Count; i++)
+          await plot.AddSolutionAsync(solutions[i]);
+      }
     }
   }