Changeset 13850 for branches/HeuristicLab.RegressionSolutionGradientView

Timestamp:

05/18/16 16:28:59 (8 years ago)

Author:

pfleck

Message:

#2597

• Extracted DensityChart from DensityTrackbar.
• Added DensityChart to RegressionSolutionTargetResponseView with different options (none/training/test/all).
• Moved RegressionSolutionGradientView and RegressionSolutionTargetResponseView to subfolder.

Location:

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

Files:

• DensityChart.Designer.cs (added)
• DensityChart.cs (added)
• DensityTrackbar.Designer.cs (modified) (4 diffs)
• DensityTrackbar.cs (modified) (3 diffs)
• GradientChart.Designer.cs (modified) (1 diff)
• GradientChart.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (3 diffs)
• Regression/RegressionSolutionGradientView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.Designer.cs)
• Regression/RegressionSolutionGradientView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs)
• Regression/RegressionSolutionTargetResponseGradientView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionTargetResponseGradientView.Designer.cs) (6 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionTargetResponseGradientView.cs) (7 diffs)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.components = new System.ComponentModel.Container();
-      System.Windows.Forms.DataVisualization.Charting.ChartArea chartArea1 = new System.Windows.Forms.DataVisualization.Charting.ChartArea();
-      System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
       this.radioButton = new System.Windows.Forms.RadioButton();
       this.trackBar = new System.Windows.Forms.TrackBar();
-      this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
+      this.chart = new HeuristicLab.Problems.DataAnalysis.Views.DensityChart();
       this.textBox = new System.Windows.Forms.TextBox();
       this.groupBox = new System.Windows.Forms.GroupBox();
       this.doubleLimitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
       ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit();
-      ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
       this.groupBox.SuspendLayout();
       this.SuspendLayout();
@@ -91 +87 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      chartArea1.AxisX.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.False;
-      chartArea1.AxisX.IsMarginVisible = false;
-      chartArea1.AxisY.Enabled = System.Windows.Forms.DataVisualization.Charting.AxisEnabled.False;
-      chartArea1.AxisY.IsMarginVisible = false;
-      chartArea1.AxisY.MajorTickMark.Enabled = false;
-      chartArea1.AxisY.Minimum = 0D;
-      chartArea1.BackColor = System.Drawing.Color.White;
-      chartArea1.BorderColor = System.Drawing.Color.White;
-      chartArea1.Name = "ChartArea1";
-      chartArea1.Position.Auto = false;
-      chartArea1.Position.Height = 100F;
-      chartArea1.Position.Width = 100F;
-      this.chart.ChartAreas.Add(chartArea1);
       this.chart.Location = new System.Drawing.Point(156, 35);
       this.chart.Name = "chart";
-      series1.ChartArea = "ChartArea1";
-      series1.ChartType = System.Windows.Forms.DataVisualization.Charting.SeriesChartType.StepLine;
-      series1.Name = "Default";
-      this.chart.Series.Add(series1);
       this.chart.Size = new System.Drawing.Size(345, 20);
       this.chart.TabIndex = 3;
-      this.chart.Text = "Density";
       // 
       // textBox
@@ -154 +132 @@
       this.Size = new System.Drawing.Size(678, 62);
       ((System.ComponentModel.ISupportInitialize)(this.trackBar)).EndInit();
-      ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
       this.groupBox.ResumeLayout(false);
       this.groupBox.PerformLayout();
@@ -166 +143 @@
     private System.Windows.Forms.TrackBar trackBar;
     private Problems.DataAnalysis.Views.DoubleLimitView doubleLimitView;
-    private Visualization.ChartControlsExtensions.EnhancedChart chart;
+    private HeuristicLab.Problems.DataAnalysis.Views.DensityChart chart;
     private System.Windows.Forms.TextBox textBox;
     private System.Windows.Forms.GroupBox groupBox;

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Common;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -76 +73 @@
 
     private void UpdateDensityChart() {
-      var series = chart.Series[0];
-      ClearPointsQuick(series.Points);
-
-      int numBuckets = trackBar.Maximum - trackBar.Minimum;
-      var buckets = new double[numBuckets];
-      var bucketSize = (Limits.Upper - Limits.Lower) / buckets.Length;
-      foreach (var value in trainingValues) {
-        if (bucketSize > 0.0) {
-          int bucketIndex = (int)((value - Limits.Lower) / bucketSize);
-          if (bucketIndex == numBuckets) {
-            bucketIndex--;
-          }
-          buckets[bucketIndex] += 1.0;
-        }
-      }
-
-      // set minimum height of all non-zero buckets on 20% of maximum
-      double min = buckets.Max() / 20.0;
-      for (int i = 0; i < buckets.Length; i++) {
-        if (buckets[i] >= 1 && buckets[i] < min)
-          buckets[i] = min;
-      }
-
-      series.Points.DataBindY(buckets);
-
-      // Set trackbar on highest density
-      double highestDensity = buckets.Max();
-      var highestIndices = buckets.Select((v, i) => new { v, i }).Where(x => x.v.IsAlmost(highestDensity)).Select(x => x.i).ToList();
-      trackBar.Value = highestIndices[highestIndices.Count / 2];
+      chart.UpdateChart(trainingValues, Limits.Lower, Limits.Upper,
+        numBuckets: trackBar.Maximum - trackBar.Minimum, minimumHeight: 0.1);
     }
 
@@ -155 +125 @@
       return (int)((value - lower) / ((upper - lower) / numberOfTicks));
     }
-
-    // workaround as per http://stackoverflow.com/questions/5744930/datapointcollection-clear-performance
-    private static void ClearPointsQuick(DataPointCollection points) {
-      points.SuspendUpdates();
-      while (points.Count > 0)
-        points.RemoveAt(points.Count - 1);
-      points.ResumeUpdates();
-    }
-
     #endregion
   }

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

@@ -52 +52 @@
       chartArea1.AxisX.StripLines.Add(stripLine2);
       chartArea1.Name = "ChartArea";
+      chartArea1.Position.Auto = false;
+      chartArea1.Position.Height = 100F;
+      chartArea1.Position.Width = 100F;
       this.chart.ChartAreas.Add(chartArea1);
       this.chart.Dock = System.Windows.Forms.DockStyle.Fill;

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

@@ -168 +168 @@
       get { return (VerticalLineAnnotation)chart.Annotations.SingleOrDefault(x => x is VerticalLineAnnotation); }
     }
+
+    internal ElementPosition InnerPlotPosition {
+      get { return chart.ChartAreas[0].InnerPlotPosition; }
+    }
     #endregion
 

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

@@ -246 +246 @@
       <DependentUpon>ClusteringSolutionVisualizationView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DensityChart.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DensityChart.Designer.cs">
+      <DependentUpon>DensityChart.cs</DependentUpon>
+    </Compile>
     <Compile Include="DensityTrackbar.cs">
       <SubType>UserControl</SubType>
@@ -277 +283 @@
       <DependentUpon>GradientChart.cs</DependentUpon>
     </Compile>
-    <Compile Include="RegressionSolutionGradientView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RegressionSolutionGradientView.Designer.cs">
+    <Compile Include="Regression\RegressionSolutionGradientView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionGradientView.Designer.cs">
       <DependentUpon>RegressionSolutionGradientView.cs</DependentUpon>
     </Compile>
@@ -298 +304 @@
       <DependentUpon>ProblemDataView.cs</DependentUpon>
     </Compile>
-    <Compile Include="RegressionSolutionTargetResponseGradientView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RegressionSolutionTargetResponseGradientView.Designer.cs">
+    <Compile Include="Regression\RegressionSolutionTargetResponseGradientView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Regression\RegressionSolutionTargetResponseGradientView.Designer.cs">
       <DependentUpon>RegressionSolutionTargetResponseGradientView.cs</DependentUpon>
     </Compile>

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/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.yAxisConfigGroupBox = new System.Windows.Forms.GroupBox();
       this.limitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
       this.automaticYAxisCheckBox = new System.Windows.Forms.CheckBox();
-      this.panel1.SuspendLayout();
+      this.densityGroupBox = new System.Windows.Forms.GroupBox();
+      this.densityComboBox = new System.Windows.Forms.ComboBox();
+      this.configSplitContainer = new System.Windows.Forms.SplitContainer();
+      this.variableGroupBox = new System.Windows.Forms.GroupBox();
+      this.scrollPanel = new System.Windows.Forms.Panel();
       this.yAxisConfigGroupBox.SuspendLayout();
+      this.densityGroupBox.SuspendLayout();
+      ((System.ComponentModel.ISupportInitialize)(this.configSplitContainer)).BeginInit();
+      this.configSplitContainer.Panel1.SuspendLayout();
+      this.configSplitContainer.Panel2.SuspendLayout();
+      this.configSplitContainer.SuspendLayout();
+      this.variableGroupBox.SuspendLayout();
+      this.scrollPanel.SuspendLayout();
       this.SuspendLayout();
       // 
       // variableListView
       // 
-      this.variableListView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
       this.variableListView.CheckBoxes = true;
-      this.variableListView.Location = new System.Drawing.Point(4, 4);
+      this.variableListView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.variableListView.Location = new System.Drawing.Point(3, 16);
       this.variableListView.Name = "variableListView";
-      this.variableListView.Size = new System.Drawing.Size(152, 332);
+      this.variableListView.Size = new System.Drawing.Size(163, 482);
       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
@@ -64 +61 @@
       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.ColumnCount = 1;
+      this.gradientChartTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+      this.gradientChartTableLayout.Location = new System.Drawing.Point(0, 0);
       this.gradientChartTableLayout.Name = "gradientChartTableLayout";
       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(828, 693);
+      this.gradientChartTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle());
+      this.gradientChartTableLayout.Size = new System.Drawing.Size(542, 0);
       this.gradientChartTableLayout.TabIndex = 2;
       // 
       // yAxisConfigGroupBox
       // 
-      this.yAxisConfigGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
       this.yAxisConfigGroupBox.Controls.Add(this.limitView);
       this.yAxisConfigGroupBox.Controls.Add(this.automaticYAxisCheckBox);
-      this.yAxisConfigGroupBox.Location = new System.Drawing.Point(4, 342);
+      this.yAxisConfigGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+      this.yAxisConfigGroupBox.Location = new System.Drawing.Point(0, 0);
       this.yAxisConfigGroupBox.Name = "yAxisConfigGroupBox";
-      this.yAxisConfigGroupBox.Size = new System.Drawing.Size(152, 98);
+      this.yAxisConfigGroupBox.Size = new System.Drawing.Size(169, 98);
       this.yAxisConfigGroupBox.TabIndex = 2;
       this.yAxisConfigGroupBox.TabStop = false;
@@ -90 +84 @@
       // limitView
       // 
+      this.limitView.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
       this.limitView.Caption = "DoubleLimit View";
       this.limitView.Content = null;
@@ -95 +91 @@
       this.limitView.Name = "limitView";
       this.limitView.ReadOnly = false;
-      this.limitView.Size = new System.Drawing.Size(140, 47);
+      this.limitView.Size = new System.Drawing.Size(157, 47);
       this.limitView.TabIndex = 1;
       // 
@@ -108 +104 @@
       this.automaticYAxisCheckBox.UseVisualStyleBackColor = true;
       // 
+      // densityGroupBox
+      // 
+      this.densityGroupBox.Controls.Add(this.densityComboBox);
+      this.densityGroupBox.Dock = System.Windows.Forms.DockStyle.Top;
+      this.densityGroupBox.Location = new System.Drawing.Point(0, 98);
+      this.densityGroupBox.Name = "densityGroupBox";
+      this.densityGroupBox.Size = new System.Drawing.Size(169, 49);
+      this.densityGroupBox.TabIndex = 3;
+      this.densityGroupBox.TabStop = false;
+      this.densityGroupBox.Text = "Density";
+      // 
+      // densityComboBox
+      // 
+      this.densityComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.densityComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.densityComboBox.FormattingEnabled = true;
+      this.densityComboBox.Items.AddRange(new object[] {
+            "None",
+            "Training",
+            "Test",
+            "All"});
+      this.densityComboBox.Location = new System.Drawing.Point(6, 19);
+      this.densityComboBox.Name = "densityComboBox";
+      this.densityComboBox.Size = new System.Drawing.Size(157, 21);
+      this.densityComboBox.TabIndex = 0;
+      this.densityComboBox.SelectedIndexChanged += new System.EventHandler(this.densityComboBox_SelectedIndexChanged);
+      // 
+      // configSplitContainer
+      // 
+      this.configSplitContainer.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.configSplitContainer.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+      this.configSplitContainer.Location = new System.Drawing.Point(0, 0);
+      this.configSplitContainer.Name = "configSplitContainer";
+      // 
+      // configSplitContainer.Panel1
+      // 
+      this.configSplitContainer.Panel1.Controls.Add(this.variableGroupBox);
+      this.configSplitContainer.Panel1.Controls.Add(this.densityGroupBox);
+      this.configSplitContainer.Panel1.Controls.Add(this.yAxisConfigGroupBox);
+      // 
+      // configSplitContainer.Panel2
+      // 
+      this.configSplitContainer.Panel2.Controls.Add(this.scrollPanel);
+      this.configSplitContainer.Size = new System.Drawing.Size(715, 648);
+      this.configSplitContainer.SplitterDistance = 169;
+      this.configSplitContainer.TabIndex = 0;
+      // 
+      // variableGroupBox
+      // 
+      this.variableGroupBox.Controls.Add(this.variableListView);
+      this.variableGroupBox.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.variableGroupBox.Location = new System.Drawing.Point(0, 147);
+      this.variableGroupBox.Name = "variableGroupBox";
+      this.variableGroupBox.Size = new System.Drawing.Size(169, 501);
+      this.variableGroupBox.TabIndex = 1;
+      this.variableGroupBox.TabStop = false;
+      this.variableGroupBox.Text = "Variables";
+      // 
+      // scrollPanel
+      // 
+      this.scrollPanel.Controls.Add(this.gradientChartTableLayout);
+      this.scrollPanel.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.scrollPanel.Location = new System.Drawing.Point(0, 0);
+      this.scrollPanel.Name = "scrollPanel";
+      this.scrollPanel.Size = new System.Drawing.Size(542, 648);
+      this.scrollPanel.TabIndex = 0;
+      // 
       // RegressionSolutionTargetResponseGradientView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.yAxisConfigGroupBox);
-      this.Controls.Add(this.panel1);
-      this.Controls.Add(this.variableListView);
+      this.Controls.Add(this.configSplitContainer);
       this.Name = "RegressionSolutionTargetResponseGradientView";
-      this.Size = new System.Drawing.Size(1033, 700);
-      this.panel1.ResumeLayout(false);
-      this.panel1.PerformLayout();
+      this.Size = new System.Drawing.Size(715, 648);
       this.yAxisConfigGroupBox.ResumeLayout(false);
       this.yAxisConfigGroupBox.PerformLayout();
+      this.densityGroupBox.ResumeLayout(false);
+      this.configSplitContainer.Panel1.ResumeLayout(false);
+      this.configSplitContainer.Panel2.ResumeLayout(false);
+      ((System.ComponentModel.ISupportInitialize)(this.configSplitContainer)).EndInit();
+      this.configSplitContainer.ResumeLayout(false);
+      this.variableGroupBox.ResumeLayout(false);
+      this.scrollPanel.ResumeLayout(false);
+      this.scrollPanel.PerformLayout();
       this.ResumeLayout(false);
 
@@ -128 +196 @@
 
     private System.Windows.Forms.ListView variableListView;
-    private System.Windows.Forms.Panel panel1;
     private System.Windows.Forms.TableLayoutPanel gradientChartTableLayout;
     private System.Windows.Forms.GroupBox yAxisConfigGroupBox;
     private System.Windows.Forms.CheckBox automaticYAxisCheckBox;
     private DoubleLimitView limitView;
+    private System.Windows.Forms.GroupBox densityGroupBox;
+    private System.Windows.Forms.ComboBox densityComboBox;
+    private System.Windows.Forms.SplitContainer configSplitContainer;
+    private System.Windows.Forms.GroupBox variableGroupBox;
+    private System.Windows.Forms.Panel scrollPanel;
   }
 }

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
@@ -33 +34 @@
   [Content(typeof(IRegressionSolution))]
   public partial class RegressionSolutionTargetResponseGradientView : DataAnalysisSolutionEvaluationView {
-    private readonly Dictionary<string, GradientChart> charts;
+    private readonly Dictionary<string, GradientChart> gradientCharts;
+    private readonly Dictionary<string, DensityChart> densityCharts;
+    private readonly Dictionary<string, Panel> groupingPanels;
+
     private const int Points = 200;
-
-    private IEnumerable<GradientChart> VisibleCharts {
-      get { return gradientChartTableLayout.Controls.OfType<GradientChart>(); }
+    private const int MaxColumns = 4;
+
+    private IEnumerable<string> VisibleVariables {
+      get {
+        foreach (ListViewItem item in variableListView.CheckedItems)
+          yield return item.Text;
+      }
+    }
+    private IEnumerable<GradientChart> VisibleGradientCharts {
+      get { return VisibleVariables.Select(v => gradientCharts[v]); }
+    }
+    private IEnumerable<DensityChart> VisibleDensityCharts {
+      get { return VisibleVariables.Select(v => densityCharts[v]); }
+    }
+    private IEnumerable<Panel> VisibleChartsPanels {
+      get { return VisibleVariables.Select(v => groupingPanels[v]); }
     }
 
     public RegressionSolutionTargetResponseGradientView() {
       InitializeComponent();
-      charts = new Dictionary<string, GradientChart>();
+      gradientCharts = new Dictionary<string, GradientChart>();
+      densityCharts = new Dictionary<string, DensityChart>();
+      groupingPanels = new Dictionary<string, Panel>();
 
       limitView.Content = new DoubleLimit(0, 1);
+      densityComboBox.SelectedIndex = 0; // select None
+
+      // Avoid additional horizontal scrollbar
+      var vertScrollWidth = SystemInformation.VerticalScrollBarWidth;
+      scrollPanel.Padding = new Padding(0, 0, vertScrollWidth, 0);
+      scrollPanel.AutoScroll = true;
     }
 
@@ -91 +116 @@
       var variableValues = allowedInputVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });
       var sharedFixedVariables = new ModifiableDataset(allowedInputVariables, variableValues);
-      // create charts
-      charts.Clear();
+
+      // create controls
+      gradientCharts.Clear();
+      densityCharts.Clear();
+      groupingPanels.Clear();
       foreach (var variableName in allowedInputVariables) {
-        var gradientChart = new GradientChart {
+        var gradientChart = CreateGradientChart(variableName, sharedFixedVariables);
+        gradientCharts.Add(variableName, gradientChart);
+
+        var densityChart = new DensityChart() {
+          //Dock = DockStyle.Top,
+          //Location = new Point(0, 0),
+          Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Right,
+          Margin = Padding.Empty,
+          Height = 12,
+          Visible = false
+        };
+        densityCharts.Add(variableName, densityChart);
+
+        var panel = new Panel() {
           Dock = DockStyle.Fill,
           Margin = Padding.Empty,
-          ShowLegend = false,
-          ShowCursor = true,
-          ShowXAxisLabel = true,
-          ShowYAxisLabel = true,
-          YAxisTicks = 5,
+          BackColor = Color.White
         };
-        gradientChart.VariableValueChanged += async (o, e) => {
-          var recalculations = VisibleCharts.Except(new[] { (GradientChart)o }).Select(async chart => {
-            await chart.RecalculateAsync(updateOnFinish: false, resetYAxis: false);
-          }).ToList();
-          await Task.WhenAll(recalculations);
-
-          if (recalculations.All(t => t.IsCompleted))
-            SetupYAxis();
-        };
-        gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableName, Points);
-        charts[variableName] = gradientChart;
-      }
+
+        panel.Controls.Add(densityChart);
+        panel.Controls.Add(gradientChart);
+        groupingPanels.Add(variableName, panel);
+      }
+
       // update variable list
       variableListView.Items.Clear();
@@ -123 +154 @@
         variableListView.Items[variable].Checked = true;
     }
+    private GradientChart CreateGradientChart(string variableName, ModifiableDataset sharedFixedVariables) {
+      var gradientChart = new GradientChart {
+        Dock = DockStyle.Fill,
+        Margin = Padding.Empty,
+        ShowLegend = false,
+        ShowCursor = true,
+        ShowXAxisLabel = true,
+        ShowYAxisLabel = true,
+        YAxisTicks = 5,
+      };
+      gradientChart.VariableValueChanged += async (o, e) => {
+        var recalculations = VisibleGradientCharts.Except(new[] { (GradientChart)o }).Select(async chart => {
+          await chart.RecalculateAsync(updateOnFinish: false, resetYAxis: false);
+        }).ToList();
+        await Task.WhenAll(recalculations);
+
+        if (recalculations.All(t => t.IsCompleted))
+          SetupYAxis();
+      };
+      gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableName, Points);
+
+      return gradientChart;
+    }
 
     private void SetupYAxis() {
@@ -128 +182 @@
       if (automaticYAxisCheckBox.Checked) {
         double min = double.MaxValue, max = double.MinValue;
-        foreach (var chart in VisibleCharts) {
+        foreach (var chart in VisibleGradientCharts) {
           if (chart.YMin < min) min = chart.YMin;
           if (chart.YMax > max) max = chart.YMax;
@@ -140 +194 @@
       }
 
-      foreach (var chart in VisibleCharts) {
+      foreach (var chart in VisibleGradientCharts) {
         chart.FixedYAxisMin = axisMin;
         chart.FixedYAxisMax = axisMax;
-        chart.Update();
-      }
-    }
-
-    // sort chart controls so that they always appear in the same order as in the list view
-    // the gradient chart layout should be suspended before calling this method
-    private void SortControls() {
+        //chart.Update();
+      }
+    }
+
+    // reorder chart controls so that they always appear in the same order as in the list view
+    // the table layout containing the controls should be suspended before calling this method
+    private void ReOrderControls() {
       var tl = gradientChartTableLayout;
-      var indices = variableListView.CheckedItems.Cast<ListViewItem>().ToDictionary(checkedItem => checkedItem.Text, checkedItem => checkedItem.Index);
-      var count = tl.Controls.Count;
-      var charts = new GradientChart[count];
-      for (int i = 0; i < count; ++i) charts[i] = (GradientChart)tl.Controls[i];
-      Array.Sort(charts, (a, b) => indices[a.FreeVariable].CompareTo(indices[b.FreeVariable]));
       tl.Controls.Clear();
-      tl.Controls.AddRange(charts);
+      int row = 0, column = 0;
+      foreach (var chartsPanel in VisibleChartsPanels) {
+        tl.Controls.Add(chartsPanel, column, row);
+        column++;
+        if (column == MaxColumns) {
+          row++;
+          column = 0;
+        }
+      }
     }
 
     private async void variableListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
-      if (charts == null) return;
       var item = e.Item;
       var variable = item.Text;
-      var chart = charts[variable];
+      var gradientChart = gradientCharts[variable];
+      var densityChart = densityCharts[variable];
+      var chartsPanel = groupingPanels[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) {
-        tl.Controls.Add(chart);
-        await chart.RecalculateAsync();
+        tl.Controls.Add(chartsPanel);
+        await gradientChart.RecalculateAsync();
+        UpdateDensityChart(densityChart, variable);
       } else {
-        tl.Controls.Remove(chart);
-      }
-      SetupYAxis();
-
-      var count = tl.Controls.Count;
-      SortControls();
-      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);
-      }
-      for (int i = 0; i < tl.RowCount; ++i) {
-        tl.RowStyles.Add(new RowStyle(SizeType.Absolute, rowHeight));
-      }
+        tl.Controls.Remove(chartsPanel);
+      }
+
+      if (tl.Controls.Count > 0) {
+        SetupYAxis();
+
+        ReOrderControls();
+
+        // set column styles
+        int numVariables = VisibleVariables.Count();
+        tl.ColumnCount = Math.Min(numVariables, MaxColumns);
+        tl.ColumnStyles.Clear();
+        for (int c = 0; c < tl.ColumnCount; c++)
+          tl.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100.0f / tl.ColumnCount));
+
+        // set column styles
+        tl.RowCount = (int)Math.Ceiling((double)numVariables / tl.ColumnCount);
+        var columnWidth = tl.Width / tl.ColumnCount; // assume all columns have the same width
+        var rowHeight = (int)(0.8 * columnWidth);
+        tl.RowStyles.Clear();
+        for (int r = 0; r < tl.RowCount; r++)
+          tl.RowStyles.Add(new RowStyle(SizeType.Absolute, rowHeight));
+      }
+
       tl.ResumeLayout();
     }
@@ -204 +269 @@
       SetupYAxis();
     }
+
+    private void densityComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      int si = densityComboBox.SelectedIndex;
+      if (si == 0) {
+        foreach (var densityChart in densityCharts.Values)
+          densityChart.Visible = false;
+      } else {
+        var indices = GetDensityIndices(si).ToList();
+
+        foreach (var entry in densityCharts) {
+          var variableName = entry.Key;
+          var densityChart = entry.Value;
+          if (!VisibleVariables.Contains(variableName))
+            continue;
+          UpdateDensityChart(densityChart, variableName, indices);
+
+        }
+      }
+    }
+    private IEnumerable<int> GetDensityIndices(int selectedIndex) {
+      var problemData = Content.ProblemData;
+      return
+        selectedIndex == 1 ? problemData.TrainingIndices :
+        selectedIndex == 2 ? problemData.TestIndices :
+        problemData.AllIndices;
+    }
+    private void UpdateDensityChart(DensityChart densityChart, string variable, IList<int> indices = null) {
+      if (densityComboBox.SelectedIndex == 0)
+        return;
+      if (indices == null) {
+        indices = GetDensityIndices(densityComboBox.SelectedIndex).ToList();
+      }
+      var data = Content.ProblemData.Dataset.GetDoubleValues(variable, indices).ToList();
+      var gradientChart = gradientCharts[variable];
+      var min = gradientChart.FixedXAxisMin;
+      var max = gradientChart.FixedXAxisMax;
+      var buckets = gradientChart.DrawingSteps;
+      if (min.HasValue && max.HasValue) {
+        densityChart.UpdateChart(data, min.Value, max.Value, buckets);
+        densityChart.Width = gradientChart.Width;
+
+        var gcPlotPosition = gradientChart.InnerPlotPosition;
+        densityChart.Left = (int)(gcPlotPosition.X / 100.0 * gradientChart.Width);
+        densityChart.Width = (int)(gcPlotPosition.Width / 100.0 * gradientChart.Width);
+
+        densityChart.Visible = true;
+      }
+    }
   }
 }
+