Changeset 18208

Timestamp:

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

Author:

gkronber

Message:

#3134: bugfixes and improvements

Location:

trunk

Files:

• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RunCollectionPartialDependencePlotView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RunCollectionPartialDependencePlotView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

@@ -453 +453 @@
     }
 
-    private Task<DoubleLimit> UpdateAllSeriesDataAsync(CancellationToken cancellationToken) {
-      var updateTasks = solutions.Select(solution => UpdateSeriesDataAsync(solution, cancellationToken));
-
-      return Task.Run(() => {
-        double min = double.MaxValue, max = double.MinValue;
-        foreach (var update in updateTasks) {
-          var limit = update.Result;
-          if (limit.Lower < min) min = limit.Lower;
-          if (limit.Upper > max) max = limit.Upper;
-        }
-
-        return new DoubleLimit(min, max);
-      }, cancellationToken);
+    private async Task<DoubleLimit> UpdateAllSeriesDataAsync(CancellationToken cancellationToken) {
+      var updateTasks = solutions.Select(solution => UpdateSeriesDataAsync(solution, cancellationToken)).ToArray();
+
+      double min = double.MaxValue, max = double.MinValue;
+      foreach (var update in updateTasks) {
+        var limit = await update;
+        if (limit.Lower < min) min = limit.Lower;
+        if (limit.Upper > max) max = limit.Upper;
+      }
+
+      return new DoubleLimit(min, max);
     }
 

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

@@ -239 +239 @@
     }
 
-    public async Task AddSolution(IRegressionSolution solution) {
+    public async Task AddSolutionAsync(IRegressionSolution solution) {
       foreach (var chart in partialDependencePlots.Values) {
         await chart.AddSolutionAsync(solution);

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

@@ -24 +24 @@
     /// </summary>
     private void InitializeComponent() {
-            this.mainPanel = new System.Windows.Forms.Panel();
-            this.SuspendLayout();
-            // 
-            // mainPanel
-            // 
-            this.mainPanel.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.mainPanel.Location = new System.Drawing.Point(0, 0);
-            this.mainPanel.Name = "mainPanel";
-            this.mainPanel.Size = new System.Drawing.Size(490, 246);
-            this.mainPanel.TabIndex = 0;
-            // 
-            // RunCollectionPartialDependencePlotView
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.mainPanel);
-            this.Name = "RunCollectionPartialDependencePlotView";
-            this.Size = new System.Drawing.Size(490, 246);
-            this.ResumeLayout(false);
+      this.tabControl = new System.Windows.Forms.TabControl();
+      this.SuspendLayout();
+      // 
+      // tabControl1
+      // 
+      this.tabControl.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.tabControl.Location = new System.Drawing.Point(0, 0);
+      this.tabControl.Name = "tabControl1";
+      this.tabControl.SelectedIndex = 0;
+      this.tabControl.Size = new System.Drawing.Size(490, 246);
+      this.tabControl.TabIndex = 0;
+      // 
+      // RunCollectionPartialDependencePlotView
+      // 
+      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.tabControl);
+      this.Name = "RunCollectionPartialDependencePlotView";
+      this.Size = new System.Drawing.Size(490, 246);
+      this.ResumeLayout(false);
 
     }
@@ -48 +49 @@
     #endregion
 
-    private System.Windows.Forms.Panel mainPanel;
+    private System.Windows.Forms.TabControl tabControl;
   }
 }

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]);
+      }
     }
   }

trunk/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs

@@ -97 +97 @@
 
       foreach (var variable in dataset.VariableNames) {
-        IEnumerable<double> values = null;
-
+        IEnumerable<double> values;
         if (rows == null) values = dataset.GetDoubleValues(variable);
         else values = dataset.GetDoubleValues(variable, rows);