Changeset 13817

Timestamp:

04/29/16 17:09:15 (8 years ago)

Author:

bburlacu

Message:

#2597: Added RegressionSolutionTargetResponseGradientView and updated GradientChart.

Location:

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

Files:

• GradientChart.cs (modified) (13 diffs)
• RegressionSolutionTargetResponseGradientView.Designer.cs (modified) (4 diffs)
• RegressionSolutionTargetResponseGradientView.cs (modified) (5 diffs)

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
@@ -32 +33 @@
   public partial class GradientChart : EnhancedChart {
     private ModifiableDataset internalDataset;
+
+    public bool ShowLegend { get; set; }
 
     private bool useMedianValues;
@@ -199 +202 @@
       if (points == 0)
         return;
-      CalculateAxisInterval();
       Series.Clear();
       var vla = VerticalLineAnnotation;
@@ -212 +214 @@
         var p = series.Points.Last();
         vla.X = p.XValue;
-        var ta = new TextAnnotation {
-          Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]),
-          Visible = true,
-          X = p.XValue,
-          Y = p.YValues[0],
-          AxisX = ChartAreas[0].AxisX,
-          AxisY = ChartAreas[0].AxisY
-        };
-        ta.ClipToChartArea = "ChartArea1";
-        ta.Name = series.Name;
-        Annotations.Add(ta);
-      }
+        ChartAreas[0].AxisX.Title = Variable + " " + vla.X.ToString("N3", CultureInfo.CurrentCulture);
+        //        var ta = new TextAnnotation {
+        //          Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]),
+        //          Visible = true,
+        //          X = p.XValue,
+        //          Y = p.YValues[0],
+        //          AxisX = ChartAreas[0].AxisX,
+        //          AxisY = ChartAreas[0].AxisY
+        //        };
+        //        ta.ClipToChartArea = "ChartArea1";
+        //        ta.Name = series.Name;
+        //        Annotations.Add(ta);
+      }
+      CalculateAxisInterval();
       AddStripLines();
-      AddLegends();
+      if (ShowLegend)
+        AddLegends();
     }
 
@@ -260 +265 @@
       var step = (max - min) / points;
       var axisX = ChartAreas[0].AxisX;
-      axisX.Title = Variable;
+      axisX.Title = Variable + " : " + v.ToString("N3", CultureInfo.CurrentCulture);
       var axisY = ChartAreas[0].AxisY;
       axisY.Title = Target;
@@ -290 +295 @@
       Legends.Clear();
       var legend = new Legend();
-      //      legend.Name = s.Name;
       legend.Alignment = StringAlignment.Center;
       legend.LegendStyle = LegendStyle.Row;
@@ -302 +306 @@
     private void AddStripLines() {
       var axisX = ChartAreas[0].AxisX;
-      axisX.Title = Variable;
-      var axisY = ChartAreas[0].AxisY;
-      axisY.Title = ProblemData.TargetVariable;
       axisX.StripLines.Clear();
       axisX.StripLines.Add(new StripLine { BackColor = Color.FromArgb(30, Color.Green), IntervalOffset = axisX.Minimum, StripWidth = min - axisX.Minimum });
@@ -317 +318 @@
       axis.Maximum = axisMax;
       axis.Interval = axisInterval;
+
+      double ymin = 0, ymax = 0;
+      foreach (var v in Series[0].Points.Select(x => x.YValues[0])) {
+        if (ymin > v) ymin = v;
+        if (ymax < v) ymax = v;
+      }
+      ChartUtil.CalculateAxisInterval(ymin, ymax, 5, out axisMin, out axisMax, out axisInterval);
+      axis = ChartAreas[0].AxisY;
+      axis.Minimum = axisMin;
+      axis.Maximum = axisMax;
+      axis.Interval = axisInterval;
     }
 
@@ -326 +338 @@
 
     #region events
+    public event EventHandler VariableValueChanged;
+    public void OnVariableValueChanged(object sender, EventArgs args) {
+      var changed = VariableValueChanged;
+      if (changed == null) return;
+      changed(sender, args);
+    }
+
     public event EventHandler ChartPropertyChanged;
     public void OnChartPropertyChanged(object sender, EventArgs args) {
@@ -353 +372 @@
         e.NewLocationX = axisX.Minimum;
       var x = e.NewLocationX;
-
-      //      var va = VerticalLineAnnotation;
-      //      Annotations.Clear();
-      //      Annotations.Add(va);
+      internalDataset.SetVariableValue(x, Variable, 0);
       for (int i = 0; i < solutionList.Count; ++i) {
         var y = GetEstimatedValue(solutionList[i], x);
@@ -363 +379 @@
         s.Points[n - 1] = new DataPoint(x, y) { MarkerColor = Color.Red, MarkerSize = 5 };
       }
-      foreach (var annotation in Annotations.OfType<TextAnnotation>()) {
-        var p = Series[annotation.Name].Points.Last();
-        annotation.Text = string.Format("X: {0:0.000}, Y: {1:0.000}", p.XValue, p.YValues[0]);
-        annotation.X = p.XValue;
-        annotation.Y = p.YValues[0];
-      }
+      ChartAreas[0].AxisX.Title = Variable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
       Update();
+      OnVariableValueChanged(this, EventArgs.Empty);
     }
 
@@ -390 +402 @@
       }
     }
-    #endregion
 
     private void GradientChart_DragDrop(object sender, DragEventArgs e) {
@@ -411 +422 @@
       }
     }
+    #endregion
   }
 }

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

@@ -25 +25 @@
     private void InitializeComponent() {
       this.variableListView = new System.Windows.Forms.ListView();
+      this.panel1 = new System.Windows.Forms.Panel();
       this.gradientChartTableLayout = new System.Windows.Forms.TableLayoutPanel();
+      this.panel1.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -35 +37 @@
       this.variableListView.Location = new System.Drawing.Point(4, 4);
       this.variableListView.Name = "variableListView";
-      this.variableListView.Size = new System.Drawing.Size(263, 944);
+      this.variableListView.Size = new System.Drawing.Size(152, 332);
       this.variableListView.TabIndex = 0;
       this.variableListView.UseCompatibleStateImageBehavior = false;
       this.variableListView.View = System.Windows.Forms.View.List;
       // 
+      // panel1
+      // 
+      this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.panel1.AutoScroll = true;
+      this.panel1.Controls.Add(this.gradientChartTableLayout);
+      this.panel1.Location = new System.Drawing.Point(162, 4);
+      this.panel1.Name = "panel1";
+      this.panel1.Size = new System.Drawing.Size(868, 693);
+      this.panel1.TabIndex = 1;
+      // 
       // gradientChartTableLayout
       // 
-      this.gradientChartTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.gradientChartTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.gradientChartTableLayout.ColumnCount = 2;
-      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-      this.gradientChartTableLayout.Location = new System.Drawing.Point(274, 4);
+      this.gradientChartTableLayout.AutoSize = true;
+      this.gradientChartTableLayout.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.gradientChartTableLayout.ColumnCount = 4;
+      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
+      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
+      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
+      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
+      this.gradientChartTableLayout.Location = new System.Drawing.Point(3, 3);
       this.gradientChartTableLayout.Name = "gradientChartTableLayout";
-      this.gradientChartTableLayout.RowCount = 2;
-      this.gradientChartTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-      this.gradientChartTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-      this.gradientChartTableLayout.Size = new System.Drawing.Size(1323, 944);
-      this.gradientChartTableLayout.TabIndex = 1;
+      this.gradientChartTableLayout.RowCount = 1;
+      this.gradientChartTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 693F));
+      this.gradientChartTableLayout.Size = new System.Drawing.Size(848, 693);
+      this.gradientChartTableLayout.TabIndex = 2;
       // 
       // RegressionSolutionTargetResponseGradientView
@@ -60 +76 @@
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.gradientChartTableLayout);
+      this.Controls.Add(this.panel1);
       this.Controls.Add(this.variableListView);
       this.Name = "RegressionSolutionTargetResponseGradientView";
-      this.Size = new System.Drawing.Size(1600, 951);
+      this.Size = new System.Drawing.Size(1033, 700);
+      this.panel1.ResumeLayout(false);
+      this.panel1.PerformLayout();
       this.ResumeLayout(false);
 
@@ -71 +89 @@
 
     private System.Windows.Forms.ListView variableListView;
+    private System.Windows.Forms.Panel panel1;
     private System.Windows.Forms.TableLayoutPanel gradientChartTableLayout;
   }

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

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Common;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
@@ -39 +61 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
+      if (Content == null) return;
       var pd = Content.ProblemData;
       var ds = pd.Dataset;
@@ -50 +73 @@
       var variableValues = variableNames.Select(x => new List<double> { pd.Dataset.GetDoubleValues(x, pd.TrainingIndices).Median() });
       internalDataset = new ModifiableDataset(variableNames, variableValues);
-
       // update charts and variable limits
       charts = new Dictionary<string, GradientChart>();
@@ -61 +83 @@
         }
         variableLimits[x] = new DoubleLimit(min, max);
-        var gradientChart = new GradientChart();
+        var gradientChart = new GradientChart { Dock = DockStyle.Fill, ShowLegend = false, Margin = Padding.Empty };
+        gradientChart.VariableValueChanged += (o, e) => {
+          foreach (var chart in gradientChartTableLayout.Controls.Cast<GradientChart>()) {
+            if (chart == (GradientChart)o) continue;
+            chart.UpdateChart();
+          }
+        };
         gradientChart.Configure(new[] { Content }, pd, internalDataset, x, min, max, Points);
         charts[x] = gradientChart;
@@ -72 +100 @@
       var variable = item.Text;
       var chart = charts[variable];
+      var tl = gradientChartTableLayout;
+      tl.SuspendLayout();
+      var columnWidth = tl.GetColumnWidths()[0]; // all columns have the same width
+      var rowHeight = 0.8f * columnWidth;
+      tl.RowStyles.Clear();
+
       if (item.Checked) {
-        gradientChartTableLayout.Controls.Add(chart);
+        tl.Controls.Add(chart);
+        var index = tl.Controls.Count - 1;
+        int rowIndex = index / tl.ColumnCount;
+        int columnIndex = index % tl.ColumnCount;
+        tl.SetRow(chart, rowIndex);
+        tl.SetColumn(chart, columnIndex);
         chart.UpdateChart();
+        tl.RowCount = rowIndex + 1;
       } else {
-        gradientChartTableLayout.Controls.Remove(chart);
+        tl.Controls.Remove(chart);
+        // relayout
+        var count = tl.Controls.Count;
+        tl.RowCount = count / tl.ColumnCount + (count % tl.ColumnCount == 0 ? 0 : 1);
+        for (int i = 0; i < count; ++i) {
+          var control = tl.Controls[i];
+          int rowIndex = i / tl.ColumnCount;
+          int columnIndex = i % tl.ColumnCount;
+          tl.SetRow(control, rowIndex);
+          tl.SetColumn(control, columnIndex);
+        }
       }
+      // set absolute row sizes
+      for (int i = 0; i < tl.RowCount; ++i) {
+        tl.RowStyles.Add(new RowStyle(SizeType.Absolute, rowHeight));
+      }
+      tl.ResumeLayout();
     }
   }