Changeset 14852 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

04/11/17 18:43:17 (8 years ago)

Author:

gkronber

Message:

#2670 renamed TargetResponseCurve and GradientChart -> PartialDependencePlot

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Files:

• RegressionSolutionGradientView.Designer.cs (modified) (4 diffs)
• RegressionSolutionGradientView.cs (modified) (5 diffs)
• RegressionSolutionPartialDependencePlotView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.Designer.cs) (6 diffs)
• RegressionSolutionPartialDependencePlotView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionTargetResponseGradientView.cs) (29 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.Designer.cs

@@ -46 +46 @@
     private void InitializeComponent() {
       this.splitContainer = new System.Windows.Forms.SplitContainer();
-      this.gradientChart = new HeuristicLab.Problems.DataAnalysis.Views.GradientChart();
+      this._partialDependencePlot = new HeuristicLab.Problems.DataAnalysis.Views.PartialDependencePlot();
       this.configurationGroupBox = new System.Windows.Forms.GroupBox();
       this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
@@ -65 +65 @@
       // splitContainer.Panel1
       // 
-      this.splitContainer.Panel1.Controls.Add(this.gradientChart);
+      this.splitContainer.Panel1.Controls.Add(this._partialDependencePlot);
       // 
       // splitContainer.Panel2
@@ -74 +74 @@
       this.splitContainer.TabIndex = 1;
       // 
-      // gradientChart
+      // _partialDependencePlot
       // 
-      this.gradientChart.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.gradientChart.DrawingSteps = 1000;
-      this.gradientChart.Location = new System.Drawing.Point(0, 0);
-      this.gradientChart.Name = "gradientChart";
-      this.gradientChart.ShowCursor = false;
-      this.gradientChart.ShowLegend = false;
-      this.gradientChart.Size = new System.Drawing.Size(715, 376);
-      this.gradientChart.TabIndex = 0;
-      this.gradientChart.XAxisTicks = 10;
-      this.gradientChart.YAxisTicks = 5;
+      this._partialDependencePlot.Dock = System.Windows.Forms.DockStyle.Fill;
+      this._partialDependencePlot.DrawingSteps = 1000;
+      this._partialDependencePlot.Location = new System.Drawing.Point(0, 0);
+      this._partialDependencePlot.Name = "_partialDependencePlot";
+      this._partialDependencePlot.ShowCursor = false;
+      this._partialDependencePlot.ShowLegend = false;
+      this._partialDependencePlot.Size = new System.Drawing.Size(715, 376);
+      this._partialDependencePlot.TabIndex = 0;
+      this._partialDependencePlot.XAxisTicks = 10;
+      this._partialDependencePlot.YAxisTicks = 5;
       // 
       // configurationGroupBox
@@ -131 +131 @@
     private System.Windows.Forms.GroupBox configurationGroupBox;
     private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
-    private Problems.DataAnalysis.Views.GradientChart gradientChart;
+    private Problems.DataAnalysis.Views.PartialDependencePlot _partialDependencePlot;
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.cs

@@ -94 +94 @@
 
       sharedFixedVariables = new ModifiableDataset(variableNames, newTrackbars.Select(tb => new List<double>(1) { (double)tb.Value }));
-      gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps);
-      await gradientChart.RecalculateAsync();
+      _partialDependencePlot.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps);
+      await _partialDependencePlot.RecalculateAsync();
 
       // Add to table and observable lists
@@ -122 +122 @@
       double axisMin, axisMax, axisInterval;
       ChartUtil.CalculateAxisInterval(min - scale * range, max + scale * range, 5, out axisMin, out axisMax, out axisInterval);
-      gradientChart.FixedYAxisMin = axisMin;
-      gradientChart.FixedYAxisMax = axisMax;
+      _partialDependencePlot.FixedYAxisMin = axisMin;
+      _partialDependencePlot.FixedYAxisMax = axisMax;
 
       trackbars.First().Checked = true;
@@ -168 +168 @@
       foreach (var tb in trackbars.Except(new[] { trackBar }))
         tb.Checked = false;
-      gradientChart.FreeVariable = variableNames[trackbars.IndexOf(trackBar)];
-      await gradientChart.RecalculateAsync();
+      _partialDependencePlot.FreeVariable = variableNames[trackbars.IndexOf(trackBar)];
+      await _partialDependencePlot.RecalculateAsync();
     }
 
@@ -175 +175 @@
       var trackBar = sender as DensityTrackbar;
       if (trackBar == null || !trackBar.Checked) return;
-      gradientChart.FixedXAxisMin = trackBar.Limits.Lower;
-      gradientChart.FixedXAxisMax = trackBar.Limits.Upper;
-      await gradientChart.RecalculateAsync();
+      _partialDependencePlot.FixedXAxisMin = trackBar.Limits.Lower;
+      _partialDependencePlot.FixedXAxisMax = trackBar.Limits.Upper;
+      await _partialDependencePlot.RecalculateAsync();
     }
 
@@ -184 +184 @@
       if (trackBar == null) return;
       sharedFixedVariables.SetVariableValue((double)trackBar.Value, variableNames[trackbars.IndexOf(trackBar)], 0);
-      await gradientChart.RecalculateAsync();
+      await _partialDependencePlot.RecalculateAsync();
     }
 

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class RegressionSolutionTargetResponseGradientView {
+  partial class RegressionSolutionPartialDependencePlotView {
     /// <summary> 
     /// Required designer variable.
@@ -26 +26 @@
       this.components = new System.ComponentModel.Container();
       this.variableListView = new System.Windows.Forms.ListView();
-      this.gradientChartTableLayout = new System.Windows.Forms.TableLayoutPanel();
+      this.partialDependencePlotTableLayout = new System.Windows.Forms.TableLayoutPanel();
       this.yAxisConfigGroupBox = new System.Windows.Forms.GroupBox();
       this.limitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
@@ -63 +63 @@
       this.variableListView.ItemChecked += new System.Windows.Forms.ItemCheckedEventHandler(this.variableListView_ItemChecked);
       // 
-      // gradientChartTableLayout
-      // 
-      this.gradientChartTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-      this.gradientChartTableLayout.AutoSize = true;
-      this.gradientChartTableLayout.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      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());
-      this.gradientChartTableLayout.Size = new System.Drawing.Size(542, 0);
-      this.gradientChartTableLayout.TabIndex = 2;
+      // partialDependencePlotTableLayout
+      // 
+      this.partialDependencePlotTableLayout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.partialDependencePlotTableLayout.AutoSize = true;
+      this.partialDependencePlotTableLayout.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+      this.partialDependencePlotTableLayout.ColumnCount = 1;
+      this.partialDependencePlotTableLayout.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
+      this.partialDependencePlotTableLayout.Location = new System.Drawing.Point(0, 0);
+      this.partialDependencePlotTableLayout.Name = "partialDependencePlotTableLayout";
+      this.partialDependencePlotTableLayout.RowCount = 1;
+      this.partialDependencePlotTableLayout.RowStyles.Add(new System.Windows.Forms.RowStyle());
+      this.partialDependencePlotTableLayout.Size = new System.Drawing.Size(542, 0);
+      this.partialDependencePlotTableLayout.TabIndex = 2;
       // 
       // yAxisConfigGroupBox
@@ -196 +196 @@
       // scrollPanel
       // 
-      this.scrollPanel.Controls.Add(this.gradientChartTableLayout);
+      this.scrollPanel.Controls.Add(this.partialDependencePlotTableLayout);
       this.scrollPanel.Dock = System.Windows.Forms.DockStyle.Fill;
       this.scrollPanel.Location = new System.Drawing.Point(0, 0);
@@ -228 +228 @@
       this.columnsNumericUpDown.ValueChanged += new System.EventHandler(this.columnsNumericUpDown_ValueChanged);
       // 
-      // RegressionSolutionTargetResponseGradientView
+      // RegressionSolutionPartialDependencePlotView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.configSplitContainer);
-      this.Name = "RegressionSolutionTargetResponseGradientView";
+      this.Name = "RegressionSolutionPartialDependencePlotView";
       this.Size = new System.Drawing.Size(715, 648);
       this.yAxisConfigGroupBox.ResumeLayout(false);
@@ -255 +255 @@
 
     private System.Windows.Forms.ListView variableListView;
-    private System.Windows.Forms.TableLayoutPanel gradientChartTableLayout;
+    private System.Windows.Forms.TableLayoutPanel partialDependencePlotTableLayout;
     private System.Windows.Forms.GroupBox yAxisConfigGroupBox;
     private System.Windows.Forms.CheckBox automaticYAxisCheckBox;

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

@@ -33 +33 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Target Response Gradients")]
+  [View("Partial Dependence Plots")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionTargetResponseGradientView : DataAnalysisSolutionEvaluationView {
-    private readonly Dictionary<string, IGradientChart> gradientCharts;
+  public partial class RegressionSolutionPartialDependencePlotView : DataAnalysisSolutionEvaluationView {
+    private readonly Dictionary<string, IPartialDependencePlot> partialDependencePlots;
     private readonly Dictionary<string, DensityChart> densityCharts;
     private readonly Dictionary<string, Panel> groupingPanels;
@@ -50 +50 @@
       }
     }
-    private IEnumerable<IGradientChart> VisibleGradientCharts {
-      get { return VisibleVariables.Select(v => gradientCharts[v]); }
+    private IEnumerable<IPartialDependencePlot> VisiblePartialDependencePlots {
+      get { return VisibleVariables.Select(v => partialDependencePlots[v]); }
     }
     private IEnumerable<DensityChart> VisibleDensityCharts {
@@ -60 +60 @@
     }
 
-    public RegressionSolutionTargetResponseGradientView() {
+    public RegressionSolutionPartialDependencePlotView() {
       InitializeComponent();
-      gradientCharts = new Dictionary<string, IGradientChart>();
+      partialDependencePlots = new Dictionary<string, IPartialDependencePlot>();
       densityCharts = new Dictionary<string, DensityChart>();
       groupingPanels = new Dictionary<string, Panel>();
@@ -137 +137 @@
 
       // create controls
-      gradientCharts.Clear();
+      partialDependencePlots.Clear();
       densityCharts.Clear();
       groupingPanels.Clear();
       foreach (var variableName in doubleVariables) {
-        var gradientChart = CreateGradientChart(variableName, sharedFixedVariables);
-        gradientCharts.Add(variableName, gradientChart);
+        var plot = CreatePartialDependencePlot(variableName, sharedFixedVariables);
+        partialDependencePlots.Add(variableName, plot);
 
         var densityChart = new DensityChart() {
@@ -149 +149 @@
           Height = 12,
           Visible = false,
-          Top = (int)(gradientChart.Height * 0.1),
+          Top = (int)(plot.Height * 0.1),
         };
         densityCharts.Add(variableName, densityChart);
 
-        gradientChart.ZoomChanged += (o, e) => {
-          var gradient = (GradientChart)o;
-          var density = densityCharts[gradient.FreeVariable];
-          density.Visible = densityComboBox.SelectedIndex != 0 && !gradient.IsZoomed;
+        plot.ZoomChanged += (o, e) => {
+          var pdp = (PartialDependencePlot)o;
+          var density = densityCharts[pdp.FreeVariable];
+          density.Visible = densityComboBox.SelectedIndex != 0 && !pdp.IsZoomed;
           if (density.Visible)
-            UpdateDensityChart(density, gradient.FreeVariable);
-        };
-        gradientChart.SizeChanged += (o, e) => {
-          var gradient = (GradientChart)o;
-          var density = densityCharts[gradient.FreeVariable];
-          density.Top = (int)(gradient.Height * 0.1);
+            UpdateDensityChart(density, pdp.FreeVariable);
+        };
+        plot.SizeChanged += (o, e) => {
+          var pdp = (PartialDependencePlot)o;
+          var density = densityCharts[pdp.FreeVariable];
+          density.Top = (int)(pdp.Height * 0.1);
         };
 
         // Initially, the inner plot areas are not initialized for hidden charts (scollpanel, ...)
         // This event handler listens for the paint event once (where everything is already initialized) to do some manual layouting.
-        gradientChart.ChartPostPaint += OnGradientChartPostPaint;
+        plot.ChartPostPaint += OnPartialDependencePlotPostPaint;
 
         var panel = new Panel() {
@@ -177 +177 @@
 
         panel.Controls.Add(densityChart);
-        panel.Controls.Add(gradientChart);
+        panel.Controls.Add(plot);
         groupingPanels.Add(variableName, panel);
       }
       foreach (var variableName in factorVariables) {
-        var gradientChart = CreateFactorGradientChart(variableName, sharedFixedVariables);
-        gradientCharts.Add(variableName, gradientChart);
+        var plot = CreateFactorPartialDependencePlot(variableName, sharedFixedVariables);
+        partialDependencePlots.Add(variableName, plot);
 
         var densityChart = new DensityChart() {
@@ -189 +189 @@
           Height = 12,
           Visible = false,
-          Top = (int)(gradientChart.Height * 0.1),
+          Top = (int)(plot.Height * 0.1),
         };
         densityCharts.Add(variableName, densityChart);
-        gradientChart.ZoomChanged += (o, e) => {
-          var gradient = (FactorGradientChart)o;
-          var density = densityCharts[gradient.FreeVariable];
-          density.Visible = densityComboBox.SelectedIndex != 0 && !gradient.IsZoomed;
+        plot.ZoomChanged += (o, e) => {
+          var pdp = (FactorPartialDependencePlot)o;
+          var density = densityCharts[pdp.FreeVariable];
+          density.Visible = densityComboBox.SelectedIndex != 0 && !pdp.IsZoomed;
           if (density.Visible)
-            UpdateDensityChart(density, gradient.FreeVariable);
-        };
-        gradientChart.SizeChanged += (o, e) => {
-          var gradient = (FactorGradientChart)o;
-          var density = densityCharts[gradient.FreeVariable];
-          density.Top = (int)(gradient.Height * 0.1);
+            UpdateDensityChart(density, pdp.FreeVariable);
+        };
+        plot.SizeChanged += (o, e) => {
+          var pdp = (FactorPartialDependencePlot)o;
+          var density = densityCharts[pdp.FreeVariable];
+          density.Top = (int)(pdp.Height * 0.1);
         };
 
         // Initially, the inner plot areas are not initialized for hidden charts (scollpanel, ...)
         // This event handler listens for the paint event once (where everything is already initialized) to do some manual layouting.
-        gradientChart.ChartPostPaint += OnFactorGradientChartPostPaint;
+        plot.ChartPostPaint += OnFactorPartialDependencePlotPostPaint;
 
         var panel = new Panel() {
@@ -216 +216 @@
 
         panel.Controls.Add(densityChart);
-        panel.Controls.Add(gradientChart);
+        panel.Controls.Add(plot);
         groupingPanels.Add(variableName, panel);
       }
@@ -237 +237 @@
       double yValue = Content.Model.GetEstimatedValues(sharedFixedVariables, new[] { 0 }).Single();
       string title = Content.ProblemData.TargetVariable + ": " + yValue.ToString("G5", CultureInfo.CurrentCulture);
-      foreach (var chart in gradientCharts.Values) {
+      foreach (var chart in partialDependencePlots.Values) {
         if (!string.IsNullOrEmpty(chart.YAxisTitle)) { // only show title for first column in grid
           chart.YAxisTitle = title;
@@ -245 +245 @@
 
 
-    private void OnGradientChartPostPaint(object o, EventArgs e) {
-      var gradient = (GradientChart)o;
-      var density = densityCharts[gradient.FreeVariable];
-
-      density.Width = gradient.Width;
-
-      var gcPlotPosition = gradient.InnerPlotPosition;
-      density.Left = (int)(gcPlotPosition.X / 100.0 * gradient.Width);
-      density.Width = (int)(gcPlotPosition.Width / 100.0 * gradient.Width);
-      gradient.UpdateTitlePosition();
+    private void OnPartialDependencePlotPostPaint(object o, EventArgs e) {
+      var plot = (PartialDependencePlot)o;
+      var density = densityCharts[plot.FreeVariable];
+
+      density.Width = plot.Width;
+
+      var gcPlotPosition = plot.InnerPlotPosition;
+      density.Left = (int)(gcPlotPosition.X / 100.0 * plot.Width);
+      density.Width = (int)(gcPlotPosition.Width / 100.0 * plot.Width);
+      plot.UpdateTitlePosition();
 
       // removed after succesful layouting due to performance reasons
       if (gcPlotPosition.Width != 0)
-        gradient.ChartPostPaint -= OnGradientChartPostPaint;
-    }
-
-    private void OnFactorGradientChartPostPaint(object o, EventArgs e) {
-      var gradient = (FactorGradientChart)o;
-      var density = densityCharts[gradient.FreeVariable];
-
-      density.Width = gradient.Width;
-
-      var gcPlotPosition = gradient.InnerPlotPosition;
-      density.Left = (int)(gcPlotPosition.X / 100.0 * gradient.Width);
-      density.Width = (int)(gcPlotPosition.Width / 100.0 * gradient.Width);
-      gradient.UpdateTitlePosition();
+        plot.ChartPostPaint -= OnPartialDependencePlotPostPaint;
+    }
+
+    private void OnFactorPartialDependencePlotPostPaint(object o, EventArgs e) {
+      var plot = (FactorPartialDependencePlot)o;
+      var density = densityCharts[plot.FreeVariable];
+
+      density.Width = plot.Width;
+
+      var gcPlotPosition = plot.InnerPlotPosition;
+      density.Left = (int)(gcPlotPosition.X / 100.0 * plot.Width);
+      density.Width = (int)(gcPlotPosition.Width / 100.0 * plot.Width);
+      plot.UpdateTitlePosition();
 
       // removed after succesful layouting due to performance reasons
       if (gcPlotPosition.Width != 0)
-        gradient.ChartPostPaint -= OnFactorGradientChartPostPaint;
+        plot.ChartPostPaint -= OnFactorPartialDependencePlotPostPaint;
     }
 
     private async void RecalculateAndRelayoutCharts() {
       foreach (var variable in VisibleVariables) {
-        var gradientChart = gradientCharts[variable];
-        await gradientChart.RecalculateAsync(false, false);
-      }
-      gradientChartTableLayout.SuspendLayout();
+        var plot = partialDependencePlots[variable];
+        await plot.RecalculateAsync(false, false);
+      }
+      partialDependencePlotTableLayout.SuspendLayout();
       SetupYAxis();
       ReOrderControls();
       SetStyles();
-      gradientChartTableLayout.ResumeLayout();
-      gradientChartTableLayout.Refresh();
+      partialDependencePlotTableLayout.ResumeLayout();
+      partialDependencePlotTableLayout.Refresh();
       foreach (var variable in VisibleVariables) {
         DensityChart densityChart;
@@ -295 +295 @@
       }
     }
-    private GradientChart CreateGradientChart(string variableName, ModifiableDataset sharedFixedVariables) {
-      var gradientChart = new GradientChart {
+    private PartialDependencePlot CreatePartialDependencePlot(string variableName, ModifiableDataset sharedFixedVariables) {
+      var plot = new PartialDependencePlot {
         Dock = DockStyle.Fill,
         Margin = Padding.Empty,
@@ -304 +304 @@
         YAxisTicks = 5,
       };
-      gradientChart.VariableValueChanged += async (o, e) => {
-        var recalculations = VisibleGradientCharts
-          .Except(new[] { (IGradientChart)o })
+      plot.VariableValueChanged += async (o, e) => {
+        var recalculations = VisiblePartialDependencePlots
+          .Except(new[] { (IPartialDependencePlot)o })
           .Select(async chart => {
             await chart.RecalculateAsync(updateOnFinish: false, resetYAxis: false);
@@ -315 +315 @@
           SetupYAxis();
       };
-      gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableName, Points);
-      gradientChart.SolutionAdded += gradientChart_SolutionAdded;
-      gradientChart.SolutionRemoved += gradientChart_SolutionRemoved;
-      return gradientChart;
-    }
-    private FactorGradientChart CreateFactorGradientChart(string variableName, ModifiableDataset sharedFixedVariables) {
-      var gradientChart = new FactorGradientChart {
+      plot.Configure(new[] { Content }, sharedFixedVariables, variableName, Points);
+      plot.SolutionAdded += partialDependencePlot_SolutionAdded;
+      plot.SolutionRemoved += partialDependencePlot_SolutionRemoved;
+      return plot;
+    }
+    private FactorPartialDependencePlot CreateFactorPartialDependencePlot(string variableName, ModifiableDataset sharedFixedVariables) {
+      var plot = new FactorPartialDependencePlot {
         Dock = DockStyle.Fill,
         Margin = Padding.Empty,
@@ -328 +328 @@
         YAxisTicks = 5,
       };
-      gradientChart.VariableValueChanged += async (o, e) => {
-        var recalculations = VisibleGradientCharts
-          .Except(new[] { (FactorGradientChart)o })
+      plot.VariableValueChanged += async (o, e) => {
+        var recalculations = VisiblePartialDependencePlots
+          .Except(new[] { (FactorPartialDependencePlot)o })
           .Select(async chart => {
             await chart.RecalculateAsync(updateOnFinish: false, resetYAxis: false);
@@ -340 +340 @@
       };
       var variableValues = Content.ProblemData.Dataset.GetStringValues(variableName).Distinct().OrderBy(n => n).ToList();
-      gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableName, variableValues);
-      gradientChart.SolutionAdded += gradientChart_SolutionAdded;
-      gradientChart.SolutionRemoved += gradientChart_SolutionRemoved;
-      return gradientChart;
+      plot.Configure(new[] { Content }, sharedFixedVariables, variableName, variableValues);
+      plot.SolutionAdded += partialDependencePlot_SolutionAdded;
+      plot.SolutionRemoved += partialDependencePlot_SolutionRemoved;
+      return plot;
     }
     private void SetupYAxis() {
@@ -349 +349 @@
       if (automaticYAxisCheckBox.Checked) {
         double min = double.MaxValue, max = double.MinValue;
-        foreach (var chart in VisibleGradientCharts) {
+        foreach (var chart in VisiblePartialDependencePlots) {
           if (chart.YMin < min) min = chart.YMin;
           if (chart.YMax > max) max = chart.YMax;
@@ -361 +361 @@
       }
 
-      foreach (var chart in VisibleGradientCharts) {
+      foreach (var chart in VisiblePartialDependencePlots) {
         chart.FixedYAxisMin = axisMin;
         chart.FixedYAxisMax = axisMax;
@@ -370 +370 @@
     // the table layout containing the controls should be suspended before calling this method
     private void ReOrderControls() {
-      var tl = gradientChartTableLayout;
+      var tl = partialDependencePlotTableLayout;
       tl.Controls.Clear();
       int row = 0, column = 0;
@@ -380 +380 @@
         tl.Controls.Add(chartsPanel, column, row);
 
-        var chart = gradientCharts[v];
+        var chart = partialDependencePlots[v];
         chart.YAxisTitle = column == 0 ? title : string.Empty;
         column++;
@@ -392 +392 @@
 
     private void SetStyles() {
-      var tl = gradientChartTableLayout;
+      var tl = partialDependencePlotTableLayout;
       tl.RowStyles.Clear();
       tl.ColumnStyles.Clear();
@@ -412 +412 @@
     }
 
-    private async void gradientChart_SolutionAdded(object sender, EventArgs<IRegressionSolution> e) {
+    private async void partialDependencePlot_SolutionAdded(object sender, EventArgs<IRegressionSolution> e) {
       var solution = e.Value;
-      foreach (var chart in gradientCharts.Values) {
+      foreach (var chart in partialDependencePlots.Values) {
         if (sender == chart) continue;
         await chart.AddSolutionAsync(solution);
@@ -420 +420 @@
     }
 
-    private async void gradientChart_SolutionRemoved(object sender, EventArgs<IRegressionSolution> e) {
+    private async void partialDependencePlot_SolutionRemoved(object sender, EventArgs<IRegressionSolution> e) {
       var solution = e.Value;
-      foreach (var chart in gradientCharts.Values) {
+      foreach (var chart in partialDependencePlots.Values) {
         if (sender == chart) continue;
         await chart.RemoveSolutionAsync(solution);
@@ -431 +431 @@
       var item = e.Item;
       var variable = item.Text;
-      var gradientChart = gradientCharts[variable];
+      var plot = partialDependencePlots[variable];
       var chartsPanel = groupingPanels[variable];
-      var tl = gradientChartTableLayout;
+      var tl = partialDependencePlotTableLayout;
 
       tl.SuspendLayout();
       if (item.Checked) {
         tl.Controls.Add(chartsPanel);
-        await gradientChart.RecalculateAsync(false, false);
+        await plot.RecalculateAsync(false, false);
       } else {
         tl.Controls.Remove(chartsPanel);
@@ -456 +456 @@
       limitView.ReadOnly = automaticYAxisCheckBox.Checked;
       SetupYAxis();
-      gradientChartTableLayout.Refresh();
+      partialDependencePlotTableLayout.Refresh();
       densityComboBox_SelectedIndexChanged(this, EventArgs.Empty); // necessary to realign the density plots
     }
@@ -464 +464 @@
         return;
       SetupYAxis();
-      gradientChartTableLayout.Refresh();
+      partialDependencePlotTableLayout.Refresh();
       densityComboBox_SelectedIndexChanged(this, EventArgs.Empty); // necessary to realign the density plots
     }
@@ -482 +482 @@
           var variableName = entry.Key;
           var densityChart = entry.Value;
-          if (!VisibleVariables.Contains(variableName) || gradientCharts[variableName].IsZoomed)
+          if (!VisibleVariables.Contains(variableName) || partialDependencePlots[variableName].IsZoomed)
             continue;
 
@@ -504 +504 @@
       if (Content.ProblemData.Dataset.VariableHasType<double>(variable)) {
         var data = Content.ProblemData.Dataset.GetDoubleValues(variable, indices).ToList();
-        var gradientChart = gradientCharts[variable] as GradientChart;
-        if (gradientChart != null) {
-          var min = gradientChart.FixedXAxisMin;
-          var max = gradientChart.FixedXAxisMax;
-          var buckets = gradientChart.DrawingSteps;
+        var plot = partialDependencePlots[variable] as PartialDependencePlot;
+        if (plot != null) {
+          var min = plot.FixedXAxisMin;
+          var max = plot.FixedXAxisMax;
+          var buckets = plot.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.Width = plot.Width;
+
+            var gcPlotPosition = plot.InnerPlotPosition;
+            densityChart.Left = (int)(gcPlotPosition.X / 100.0 * plot.Width);
+            densityChart.Width = (int)(gcPlotPosition.Width / 100.0 * plot.Width);
 
             densityChart.Visible = true;
           }
-          gradientChart.UpdateTitlePosition();
+          plot.UpdateTitlePosition();
         }
       } else if (Content.ProblemData.Dataset.VariableHasType<string>(variable)) {
         var data = Content.ProblemData.Dataset.GetStringValues(variable).ToList();
-        var gradientChart = gradientCharts[variable] as FactorGradientChart;
-        if (gradientChart != null) {
+        var plot = partialDependencePlots[variable] as FactorPartialDependencePlot;
+        if (plot != null) {
           densityChart.UpdateChart(data);
-          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.Width = plot.Width;
+
+          var gcPlotPosition = plot.InnerPlotPosition;
+          densityChart.Left = (int)(gcPlotPosition.X / 100.0 * plot.Width);
+          densityChart.Width = (int)(gcPlotPosition.Width / 100.0 * plot.Width);
 
           densityChart.Visible = true;
 
-          gradientChart.UpdateTitlePosition();
+          plot.UpdateTitlePosition();
         }
       }
@@ -543 +543 @@
       int columns = Math.Min(VisibleVariables.Count(), MaxColumns);
       if (columns > 0) {
-        var tl = gradientChartTableLayout;
+        var tl = partialDependencePlotTableLayout;
         MaxColumns = columns;
         tl.SuspendLayout();
@@ -556 +556 @@
     private async void solution_ModelChanged(object sender, EventArgs e) {
       foreach (var variable in VisibleVariables) {
-        var gradientChart = gradientCharts[variable];
+        var pdp = partialDependencePlots[variable];
         var densityChart = densityCharts[variable];
         // recalculate and refresh
-        await gradientChart.RecalculateAsync(false, false);
-        gradientChart.Refresh();
+        await pdp.RecalculateAsync(false, false);
+        pdp.Refresh();
         UpdateDensityChart(densityChart, variable);
       }