Changeset 13816 for branches/HeuristicLab.RegressionSolutionGradientView

Timestamp:

04/29/16 17:01:10 (9 years ago)

Author:

pfleck

Message:

#2597:

• Fixed typo in class/filename.
• Added new control that shows density information adjacent to the trackbar.

Location:

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

Files:

• DensityTrackbar.Designer.cs (added)
• DensityTrackbar.cs (added)
• GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionIteractiveRangeEstimatorView.Designer.cs) (4 diffs)
• GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionIteractiveRangeEstimatorView.cs) (15 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class GaussianProcessRegressionSolutionIteractiveRangeEstimatorView {
+  partial class GaussianProcessRegressionSolutionInteractiveRangeEstimatorView {
     /// <summary> 
     /// Required designer variable.
@@ -114 +114 @@
       // tableLayoutPanel
       // 
-      this.tableLayoutPanel.AutoSize = true;
-      this.tableLayoutPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-      this.tableLayoutPanel.ColumnCount = 3;
-      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 100F));
-      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
-      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F));
+      this.tableLayoutPanel.AutoScroll = true;
+      this.tableLayoutPanel.ColumnCount = 1;
+      this.tableLayoutPanel.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
       this.tableLayoutPanel.Dock = System.Windows.Forms.DockStyle.Fill;
       this.tableLayoutPanel.Location = new System.Drawing.Point(3, 16);
@@ -125 +122 @@
       this.tableLayoutPanel.RowCount = 1;
       this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle());
-      this.tableLayoutPanel.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
       this.tableLayoutPanel.Size = new System.Drawing.Size(709, 192);
       this.tableLayoutPanel.TabIndex = 0;
       // 
-      // GaussianProcessRegressionSolutionRangeEstimatorView
+      // GaussianProcessRegressionSolutionInteractiveRangeEstimatorView
       // 
       this.AllowDrop = true;
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.splitContainer);
-      this.Name = "GaussianProcessRegressionSolutionRangeEstimatorView";
+      this.Name = "GaussianProcessRegressionSolutionInteractiveRangeEstimatorView";
       this.Size = new System.Drawing.Size(715, 591);
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();
@@ -142 +138 @@
       this.splitContainer.ResumeLayout(false);
       this.configurationGroupBox.ResumeLayout(false);
-      this.configurationGroupBox.PerformLayout();
       this.ResumeLayout(false);
 

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
-using System.Globalization;
 using System.Linq;
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Collections;
 using HeuristicLab.Data;
-using HeuristicLab.Data.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -38 +37 @@
   [View("Interactive Estimator")]
   [Content(typeof(GaussianProcessRegressionSolution))]
-  public partial class GaussianProcessRegressionSolutionIteractiveRangeEstimatorView : DataAnalysisSolutionEvaluationView {
-    const int TrackBarSteps = 1000;
-    const int DrawingSteps = 1000;
+  public partial class GaussianProcessRegressionSolutionInteractiveRangeEstimatorView
+    : DataAnalysisSolutionEvaluationView {
+
+    private const int DrawingSteps = 1000;
 
     private const string EstimatedMeanSeriesName = "Estimated Mean";
     private const string EstimatedVarianceSeriesName = "95% Conficence Interval";
 
-    private static readonly string LabelFormatString = "{0}:" + Environment.NewLine + "{1}";
-
-    private List<string> variableNames;
-    private List<DoubleRange> ranges;
-    private List<RadioButton> radioButtons;
-    private List<TrackBar> trackBars;
-
+    private readonly List<string> dimensionNames;
+    private readonly ObservableList<DensityTrackbar> dimensionTrackbars;
 
     private int ActiveDimension {
-      get { return radioButtons.FindIndex(rb => rb.Checked); }
+      get { return dimensionTrackbars.FindIndex(tb => tb.Checked); }
     }
 
@@ -61 +56 @@
       set { base.Content = value; }
     }
-    public GaussianProcessRegressionSolutionIteractiveRangeEstimatorView()
-        : base() {
-      variableNames = new List<string>();
-      ranges = new List<DoubleRange>();
-      radioButtons = new List<RadioButton>();
-      trackBars = new List<TrackBar>();
+
+    public GaussianProcessRegressionSolutionInteractiveRangeEstimatorView()
+      : base() {
+      dimensionNames = new List<string>();
+
+      dimensionTrackbars = new ObservableList<DensityTrackbar>();
+      dimensionTrackbars.ItemsAdded += (sender, args) => {
+        ForEach(args.Items.Select(i => i.Value), RegisterEvents);
+      };
+      dimensionTrackbars.ItemsRemoved += (sender, args) => {
+        ForEach(args.Items.Select(i => i.Value), DeregisterEvents);
+      };
+      dimensionTrackbars.CollectionReset += (sender, args) => {
+        ForEach(args.OldItems.Select(i => i.Value), DeregisterEvents);
+        ForEach(args.Items.Select(i => i.Value), RegisterEvents);
+      };
+
 
       InitializeComponent();
-      tableLayoutPanel.HorizontalScroll.Maximum = 0;
-      tableLayoutPanel.AutoScroll = false;
-      tableLayoutPanel.HorizontalScroll.Visible = false;
-      tableLayoutPanel.AutoScroll = true;
-
-      //configure axis
+
+      // Avoid additional horizontal scrollbar
+      var vertScrollWidth = SystemInformation.VerticalScrollBarWidth;
+      tableLayoutPanel.Padding = new Padding(0, 0, vertScrollWidth, 0);
+
+      // Configure axis
       chart.CustomizeAllChartAreas();
       chart.ChartAreas[0].CursorX.IsUserSelectionEnabled = true;
@@ -88 +94 @@
       chart.Series.Clear();
       chart.ChartAreas[0].AxisX.StripLines.Clear();
-      if (Content == null) return;
-
-      double minX = ranges[ActiveDimension].Start;
-      double maxX = ranges[ActiveDimension].End;
+      if (Content == null || ActiveDimension < 0) return;
+
+      double minX = dimensionTrackbars[ActiveDimension].Limits.Lower;
+      double maxX = dimensionTrackbars[ActiveDimension].Limits.Upper;
       decimal stepSize = (decimal)((maxX - minX) / DrawingSteps);
-
-      //double axisMin, axisMax, axisInterval;
-      //ChartUtil.CalculateAxisInterval(minX, maxX, 10, out axisMin, out axisMax, out axisInterval);
-      //decimal axisStepsSize = (decimal)((maxX - minX) / DrawingSteps);
 
       // Build dataset
       var activeXs = Enumerable.Range(0, DrawingSteps).Select(i => (decimal)minX + i * stepSize).ToList();
-      var fixedXs = trackBars.Zip(ranges, (t, r) => (decimal)r.Start + ((decimal)r.End - (decimal)r.Start)/TrackBarSteps*t.Value).ToList();
-      var values = new double[DrawingSteps, variableNames.Count];
+      var fixedXs = dimensionTrackbars.Select(tb => tb.Value).ToList();
+      var values = new double[DrawingSteps, dimensionNames.Count];
       for (int r = 0; r < DrawingSteps; r++) {
-        for (int c = 0; c < variableNames.Count; c++) {
+        for (int c = 0; c < dimensionNames.Count; c++) {
           values[r, c] = (double)(c == ActiveDimension ? activeXs[r] : fixedXs[c]);
         }
       }
-      var dataset = new Dataset(variableNames, values);
+      var dataset = new Dataset(dimensionNames, values);
 
       // Estimations
@@ -119 +121 @@
       chart.ChartAreas[0].AxisX.Interval = (maxX - minX) / 10;
 
+      // ToDo only databind and put config in codebehind
       chart.Series.Add(EstimatedVarianceSeriesName);
       chart.Series[EstimatedVarianceSeriesName].LegendText = EstimatedVarianceSeriesName;
@@ -132 +135 @@
       var upper = means.Zip(variances, GetUpperConfBound).ToList();
       chart.Series[EstimatedVarianceSeriesName].Points.DataBindXY(activeXs, lower, upper);
-      //InsertEmptyPoints(chart.Series[EstimatedVarianceSeriesName]);
-
       chart.Series[EstimatedMeanSeriesName].Points.DataBindXY(activeXs, means);
-      //InsertEmptyPoints(chart.Series[EstimatedMeanSeriesName]);
 
       // Update StripLines
-      var trainingValues = Content.ProblemData.Dataset.GetDoubleValues(variableNames[ActiveDimension], Content.ProblemData.TrainingIndices);
+      var trainingValues = Content.ProblemData.Dataset.GetDoubleValues(dimensionNames[ActiveDimension],
+        Content.ProblemData.TrainingIndices);
       var trainingRange = new DoubleRange(trainingValues.Min(), trainingValues.Max());
       if (minX < trainingRange.Start)
@@ -144 +145 @@
       if (maxX > trainingRange.End)
         CreateAndAddStripLine(trainingRange.End, maxX, Color.FromArgb(40, 223, 58, 2), Color.Transparent);
+
+      // Update axis description
+      chart.ChartAreas[0].AxisX.Title = dimensionNames[ActiveDimension];
     }
 
@@ -163 +167 @@
       tableLayoutPanel.Controls.Clear();
 
-      variableNames.Clear();
-      ranges.Clear();
-      radioButtons.Clear();
-      trackBars.Clear();
-
+      dimensionNames.Clear();
+      dimensionTrackbars.Clear();
 
       if (Content == null) {
@@ -175 +176 @@
       }
 
-      variableNames.AddRange(Content.ProblemData.AllowedInputVariables);
-      for (int i = 0; i < variableNames.Count; i++) {
-        var values = Content.ProblemData.Dataset.GetDoubleValues(variableNames[i], Content.ProblemData.AllIndices);
+      dimensionNames.AddRange(Content.ProblemData.AllowedInputVariables);
+      var ranges = new List<DoubleLimit>();
+      for (int i = 0; i < dimensionNames.Count; i++) {
+        var values = Content.ProblemData.Dataset.GetDoubleValues(dimensionNames[i], Content.ProblemData.AllIndices);
         double min, max, interval;
         ChartUtil.CalculateAxisInterval(values.Min(), values.Max(), 10, out min, out max, out interval);
-        ranges.Add(new DoubleRange(min, max));
-      }
-
-      tableLayoutPanel.RowCount = variableNames.Count;
-      while (tableLayoutPanel.RowStyles.Count < variableNames.Count)
+        ranges.Add(new DoubleLimit(min, max));
+      }
+
+      tableLayoutPanel.RowCount = dimensionNames.Count;
+      while (tableLayoutPanel.RowStyles.Count < dimensionNames.Count)
         tableLayoutPanel.RowStyles.Add(new RowStyle(SizeType.AutoSize));
 
-      for (int i = 0; i < variableNames.Count; i++) {
-        var radioButton = new RadioButton {
-          Text =  string.Format(LabelFormatString, variableNames[i], ranges[i].Start + (ranges[i].End - ranges[i].Start) / 2),
-          Checked = i == 0,
-          Anchor = AnchorStyles.Top | AnchorStyles.Left,
-          AutoSize = true,
-        };
-        radioButton.CheckedChanged += radioButton_CheckedChanged;
-        var trackBar = new TrackBar {
-          Minimum = 0,
-          Maximum = TrackBarSteps,
-          Value = TrackBarSteps / 2,
-          TickFrequency = TrackBarSteps / 10,
-          LargeChange = TrackBarSteps / 10,
-          Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right,
-          Enabled = i != 0
-        };
-        trackBar.ValueChanged += trackBar_ValueChanged;
-        var rangeView = new DoubleRangeView {
-          Content = ranges[i],
-          Anchor = AnchorStyles.Top | AnchorStyles.Right,
-        };
-        rangeView.Content.ValueChanged += rangeView_ValueChanged;
-
-        tableLayoutPanel.RowStyles[i].SizeType = SizeType.AutoSize;
-        tableLayoutPanel.Controls.Add(radioButton, 0, i);
-        tableLayoutPanel.Controls.Add(trackBar, 1, i);
-        tableLayoutPanel.Controls.Add(rangeView, 2, i);
-
-        radioButtons.Add(radioButton);
-        trackBars.Add(trackBar);
-      }
+      for (int i = 0; i < dimensionNames.Count; i++) {
+        var name = dimensionNames[i];
+        var trainingData =
+          Content.ProblemData.Dataset.GetDoubleValues(name, Content.ProblemData.TrainingIndices).ToList();
+
+        var dimensionTrackbar = new DensityTrackbar(name, ranges[i], trainingData);
+
+        // events registered automatically
+        dimensionTrackbars.Add(dimensionTrackbar);
+
+        dimensionTrackbar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+        tableLayoutPanel.Controls.Add(dimensionTrackbar, 0, i);
+      }
+
+      if (dimensionTrackbars.Any())
+        dimensionTrackbars.First().Checked = true;
 
       tableLayoutPanel.ResumeLayout(true);
@@ -224 +210 @@
     }
 
-    private void UpdateCurrentValueLabel(int dim = -1) {
-      if (dim < 0) {
-        for (int i = 0; i < radioButtons.Count; i++) {
-          decimal value = (decimal)ranges[i].Start + ((decimal)ranges[i].End - (decimal)ranges[i].Start) / TrackBarSteps * trackBars[i].Value;
-          radioButtons[i].Text = Text = string.Format(LabelFormatString, variableNames[i], i == ActiveDimension ? "<Plotted>" : value.ToString(CultureInfo.InvariantCulture));
-        }
-      } else {
-        decimal value = (decimal)ranges[dim].Start + ((decimal)ranges[dim].End - (decimal)ranges[dim].Start)  /TrackBarSteps * trackBars[dim].Value;
-        radioButtons[dim].Text = Text = string.Format(LabelFormatString, variableNames[dim], dim == ActiveDimension ? "<Plotted>" : value.ToString(CultureInfo.InvariantCulture));
-      }
-    }
-
-    private void radioButton_CheckedChanged(object sender, EventArgs e) {
-      var radioButton = sender as RadioButton;
-      if (radioButton == null || !radioButton.Checked) return;
-
-      int index = radioButtons.IndexOf(radioButton);
-
-      var inputVariables = Content.ProblemData.AllowedInputVariables.ToList();
-      for (int i = 0; i < inputVariables.Count; i++) {
-        radioButtons[i].Checked = i == index;
-        trackBars[i].Enabled = i != index;
-      }
-
-      UpdateCurrentValueLabel();
-      RedrawChart();
-    }
-    private void trackBar_ValueChanged(object sender, EventArgs e) {
-      UpdateCurrentValueLabel(trackBars.FindIndex(t => t == sender));
-      RedrawChart();
-    }
-    private void rangeView_ValueChanged(object sender, EventArgs e) {
-      UpdateCurrentValueLabel(ranges.FindIndex(r => r == sender));
+    private void RegisterEvents(DensityTrackbar trackbar) {
+      trackbar.CheckedChanged += DimensionTrackbar_CheckedChanged;
+      trackbar.ValueChanged += DimensionTrackbar_ValueChanged;
+      trackbar.LimitsChanged += DimensionTrackbar_LimitsChanged;
+    }
+
+    private void DeregisterEvents(DensityTrackbar trackbar) {
+      trackbar.CheckedChanged -= DimensionTrackbar_CheckedChanged;
+      trackbar.ValueChanged -= DimensionTrackbar_ValueChanged;
+      trackbar.LimitsChanged -= DimensionTrackbar_LimitsChanged;
+    }
+
+    private void DimensionTrackbar_CheckedChanged(object sender, EventArgs e) {
+      var trackBarSender = sender as DensityTrackbar;
+      if (trackBarSender == null || !trackBarSender.Checked) return;
+      // Uncheck all others
+      foreach (var tb in dimensionTrackbars.Except(new[] { trackBarSender }))
+        tb.Checked = false;
+      RedrawChart();
+    }
+
+    private void DimensionTrackbar_LimitsChanged(object sender, EventArgs e) {
+      RedrawChart();
+    }
+
+    private void DimensionTrackbar_ValueChanged(object sender, EventArgs e) {
       RedrawChart();
     }
 
     #region Events
+
     protected override void RegisterContentEvents() {
       base.RegisterContentEvents();
-      Content.ModelChanged += new EventHandler(Content_ModelChanged);
-      Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
-    }
+      Content.ModelChanged += Content_ModelChanged;
+      Content.ProblemDataChanged += Content_ProblemDataChanged;
+    }
+
     protected override void DeregisterContentEvents() {
       base.DeregisterContentEvents();
-      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
-      Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged);
+      Content.ModelChanged -= Content_ModelChanged;
+      Content.ProblemDataChanged -= Content_ProblemDataChanged;
     }
 
@@ -277 +258 @@
       RedrawChart();
     }
+
     private void Content_ModelChanged(object sender, EventArgs e) {
       RedrawChart();
     }
+
     private void Content_ProblemDataChanged(object sender, EventArgs e) {
       UpdateConfigurationControls();
@@ -288 +271 @@
       var result = chart.HitTest(e.X, e.Y);
       if (true || result.ChartArea != null && (result.ChartElementType == ChartElementType.PlottingArea ||
-                                       result.ChartElementType == ChartElementType.Gridlines) ||
-                                       result.ChartElementType == ChartElementType.StripLines) {
+                                               result.ChartElementType == ChartElementType.Gridlines) ||
+          result.ChartElementType == ChartElementType.StripLines) {
         foreach (var axis in result.ChartArea.Axes)
           axis.ScaleView.ZoomReset(int.MaxValue);
       }
     }
+
     private void chart_MouseMove(object sender, MouseEventArgs e) {
       //HitTestResult result = chart.HitTest(e.X, e.Y);
@@ -301 +285 @@
       //  Cursor = Cursors.Default;
     }
+
     private void chart_MouseDown(object sender, MouseEventArgs e) {
       //HitTestResult result = chart.HitTest(e.X, e.Y);
@@ -307 +292 @@
       //}
     }
+
     private void chart_CustomizeLegend(object sender, CustomizeLegendEventArgs e) {
       //if (chart.Series.Count != 4) return;
@@ -314 +300 @@
       //e.LegendItems[3].Cells[1].ForeColor = this.chart.Series[TARGETVARIABLE_SERIES_NAME].Points.Count == 0 ? Color.Gray : Color.Black;
     }
+
     #endregion
 
     #region Helper
+
     private double GetLowerConfBound(double m, double s2) {
       return m - 1.96 * Math.Sqrt(s2);
     }
+
     private double GetUpperConfBound(double m, double s2) {
       return m + 1.96 * Math.Sqrt(s2);
     }
+
+    public static void ForEach<T>(IEnumerable<T> source, Action<T> action) {
+      foreach (T item in source)
+        action(item);
+    }
+
     #endregion
   }

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

@@ -195 +195 @@
       <DependentUpon>GaussianProcessRegressionSolutionEstimatedValuesView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DensityTrackbar.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DensityTrackbar.Designer.cs">
+      <DependentUpon>DensityTrackbar.cs</DependentUpon>
+    </Compile>
     <Compile Include="MeanProdView.cs">
       <SubType>UserControl</SubType>
@@ -250 +256 @@
       <DependentUpon>GaussianProcessRegressionSolutionLineChartView.cs</DependentUpon>
     </Compile>
-    <Compile Include="GaussianProcessRegressionSolutionIteractiveRangeEstimatorView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GaussianProcessRegressionSolutionIteractiveRangeEstimatorView.Designer.cs">
-      <DependentUpon>GaussianProcessRegressionSolutionIteractiveRangeEstimatorView.cs</DependentUpon>
+    <Compile Include="GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.Designer.cs">
+      <DependentUpon>GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.cs</DependentUpon>
     </Compile>
     <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">