Changeset 13836

Timestamp:

05/04/16 17:17:08 (8 years ago)

Author:

pfleck

Message:

#2597 Implemented correct coloring when multiple solutions are added for comparison with respect potential overlapping confidence intervals.

Location:

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• GradientChart.Designer.cs (modified) (1 diff)
• GradientChart.cs (modified) (4 diffs)
• RegressionSolutionGradientView.cs (modified) (1 diff)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.Designer.cs

@@ -55 +55 @@
       legend1.Alignment = System.Drawing.StringAlignment.Center;
       legend1.Docking = System.Windows.Forms.DataVisualization.Charting.Docking.Top;
-      legend1.LegendItemOrder = System.Windows.Forms.DataVisualization.Charting.LegendItemOrder.SameAsSeriesOrder;
+      legend1.LegendItemOrder = System.Windows.Forms.DataVisualization.Charting.LegendItemOrder.ReversedSeriesOrder;
+      legend1.LegendStyle = System.Windows.Forms.DataVisualization.Charting.LegendStyle.Row;
       legend1.Name = "Default";
       this.chart.Legends.Add(legend1);
       this.chart.Location = new System.Drawing.Point(0, 0);
       this.chart.Name = "chart";
-      this.chart.PaletteCustomColors = new System.Drawing.Color[] {
-        System.Drawing.Color.FromArgb(((int)(((byte)(252)))), ((int)(((byte)(180)))), ((int)(((byte)(65))))),
-        System.Drawing.Color.FromArgb(((int)(((byte)(65)))), ((int)(((byte)(140)))), ((int)(((byte)(240)))))};
       this.chart.Size = new System.Drawing.Size(453, 308);
       this.chart.TabIndex = 0;

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Globalization;
 using System.Linq;
@@ -27 +28 @@
 using System.Windows.Forms.DataVisualization.Charting;
 using HeuristicLab.Common;
+using HeuristicLab.MainForm.WindowsForms;
 using HeuristicLab.Visualization.ChartControlsExtensions;
 
@@ -110 +112 @@
     public GradientChart() {
       InitializeComponent();
+
+      // Configure axis
+      chart.CustomizeAllChartAreas();
+      chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisX.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorX.Interval = 0;
+
+      chart.ChartAreas[0].CursorY.IsUserSelectionEnabled = true;
+      chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
+      chart.ChartAreas[0].CursorY.Interval = 0;
     }
 
@@ -187 +199 @@
       axis.Interval = axisInterval;
 
-      // Create series
-      chart.Series.Clear();
+      // Create series <mean, conf. interval>
+      var seriesDict = new Dictionary<Series, Series>();
       for (int i = 0; i < solutions.Count; ++i) {
         var solution = solutions[i];
         Series confidenceIntervalPlotSeries;
-        var series = CreateSeries(solution, out confidenceIntervalPlotSeries);
-        series.Name = Solutions.First().ProblemData.TargetVariable + " " + i;
+        var meanSeries = CreateSeries(solution, out confidenceIntervalPlotSeries);
+        meanSeries.Name = Solutions.First().ProblemData.TargetVariable + " " + i;
+        seriesDict.Add(meanSeries, confidenceIntervalPlotSeries);
         if (confidenceIntervalPlotSeries != null)
-          chart.Series.Add(confidenceIntervalPlotSeries);
+          confidenceIntervalPlotSeries.Name = "95% Conf. Interval " + meanSeries.Name;
+      }
+
+      chart.SuspendRepaint();
+      chart.Series.Clear();
+      // Add mean series for applying palette colors
+      foreach (var series in seriesDict.Keys) {
+        series.LegendText = series.Name;
         chart.Series.Add(series);
       }
+      chart.Palette = ChartColorPalette.BrightPastel;
+      chart.ApplyPaletteColors();
+      chart.Palette = ChartColorPalette.None;
+
+      foreach (var series in seriesDict) {
+        if (series.Value == null) continue;
+        int idx = chart.Series.IndexOf(series.Key);
+        series.Value.Color = Color.FromArgb(40, series.Key.Color);
+        series.Value.IsVisibleInLegend = false;
+        chart.Series.Insert(idx, series.Value);
+      }
+      chart.ResumeRepaint(true);
+
+
       //// calculate Y-axis interval
       //double ymin = 0, ymax = 0;

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs

@@ -33 +33 @@
   [View("Gradient View")]
   [Content(typeof(IConfidenceBoundRegressionSolution))]
-  public partial class RegressionSolutionGradientView
-    : DataAnalysisSolutionEvaluationView {
-
+  public partial class RegressionSolutionGradientView : DataAnalysisSolutionEvaluationView {
     private const int DrawingSteps = 1000;
-
-    private const string EstimatedMeanSeriesName = "Estimated Mean";
-    private const string EstimatedVarianceSeriesName = "95% Conficence Interval";
 
     private readonly List<string> variableNames;