Changeset 7700

Timestamp:

04/03/12 14:32:24 (12 years ago)

Author:

sforsten

Message:

#1811:

• added toggle of series
• changed existing MouseDown event to MouseDoubleClick
• renamed "Mean Model" to "Baseline". For consistence some variable names also have been renamed

Location:

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

Files:

• RegressionSolutionErrorCharacteristicsCurveView.Designer.cs (modified) (1 diff)
• RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (8 diffs)

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

@@ -49 +49 @@
       this.chart.TabIndex = 0;
       this.chart.Text = "chart";
+      this.chart.CustomizeLegend += new System.EventHandler<System.Windows.Forms.DataVisualization.Charting.CustomizeLegendEventArgs>(this.chart_CustomizeLegend);
+      this.chart.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.Chart_MouseDoubleClick);
+      this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
       this.chart.MouseDown += new System.Windows.Forms.MouseEventHandler(this.chart_MouseDown);
       // 

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
@@ -36 +37 @@
     protected const string AllSamples = "All Samples";
 
+    protected Dictionary<string, List<double>> seriesResiduals = new Dictionary<string, List<double>>();
+
     public RegressionSolutionErrorCharacteristicsCurveView()
       : base() {
@@ -99 +102 @@
     protected virtual void UpdateChart() {
       chart.Series.Clear();
+      seriesResiduals.Clear();
       chart.Annotations.Clear();
       if (Content == null) return;
@@ -104 +108 @@
       var originalValues = GetOriginalValues().ToList();
       constantModel = CreateConstantModel();
-      var meanModelEstimatedValues = GetEstimatedValues(constantModel);
-      var meanModelResiduals = GetResiduals(originalValues, meanModelEstimatedValues);
-
-      meanModelResiduals.Sort();
-      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(meanModelResiduals.Last());
-      chart.ChartAreas[0].CursorX.Interval = meanModelResiduals.First() / 100;
-
-      Series meanModelSeries = new Series("Mean Model");
-      meanModelSeries.ChartType = SeriesChartType.FastLine;
-      UpdateSeries(meanModelResiduals, meanModelSeries);
-      meanModelSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(meanModelSeries);
-      meanModelSeries.Tag = constantModel;
-      chart.Series.Add(meanModelSeries);
+      var baselineEstimatedValues = GetEstimatedValues(constantModel);
+      var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
+
+      baselineResiduals.Sort();
+      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(baselineResiduals.Last());
+      chart.ChartAreas[0].CursorX.Interval = baselineResiduals.First() / 100;
+
+      Series baselineSeries = new Series("Baseline");
+      baselineSeries.ChartType = SeriesChartType.FastLine;
+      seriesResiduals[baselineSeries.Name] = baselineResiduals;
+      UpdateSeries(baselineResiduals, baselineSeries);
+      baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
+      baselineSeries.Tag = constantModel;
+      chart.Series.Add(baselineSeries);
 
       AddRegressionSolution(Content);
@@ -128 +133 @@
       solutionSeries.ChartType = SeriesChartType.FastLine;
       var estimatedValues = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
+      seriesResiduals[solutionSeries.Name] = estimatedValues;
       UpdateSeries(estimatedValues, solutionSeries);
       solutionSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(solutionSeries);
@@ -200 +206 @@
     }
 
-    protected IEnumerable<double> GetMeanModelEstimatedValues(IEnumerable<double> originalValues) {
+    protected IEnumerable<double> GetbaselineEstimatedValues(IEnumerable<double> originalValues) {
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
       return Enumerable.Repeat(averageTrainingTarget, originalValues.Count());
@@ -229 +235 @@
     }
 
-    #region Mean Model
-    private void chart_MouseDown(object sender, MouseEventArgs e) {
-      if (e.Clicks < 2) return;
+    #region events
+    private void Chart_MouseDoubleClick(object sender, MouseEventArgs e) {
       HitTestResult result = chart.HitTest(e.X, e.Y);
       if (result.ChartElementType != ChartElementType.LegendItem) return;
@@ -238 +243 @@
       MainFormManager.MainForm.ShowContent((IRegressionSolution)result.Series.Tag);
     }
+    private void chart_MouseMove(object sender, MouseEventArgs e) {
+      HitTestResult result = chart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.LegendItem)
+        Cursor = Cursors.Hand;
+      else
+        Cursor = Cursors.Default;
+    }
+    private void chart_MouseDown(object sender, MouseEventArgs e) {
+      HitTestResult result = chart.HitTest(e.X, e.Y);
+      if (result.ChartElementType == ChartElementType.LegendItem) {
+        ToggleSeriesData(result.Series);
+      }
+    }
+    private void chart_CustomizeLegend(object sender, CustomizeLegendEventArgs e) {
+      foreach (LegendItem legend in e.LegendItems) {
+        legend.Cells[1].ForeColor = this.chart.Series[legend.SeriesName].Points.Count == 0 ? Color.Gray : Color.Black;
+      }
+    }
+    #endregion
 
     private IRegressionSolution CreateConstantModel() {
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndizes).Average();
       var solution = new ConstantRegressionModel(averageTrainingTarget).CreateRegressionSolution(ProblemData);
-      solution.Name = "Mean Model";
+      solution.Name = "Baseline";
       return solution;
     }
-    #endregion
+
+    private void ToggleSeriesData(Series series) {
+      if (series.Points.Count > 0) {  //checks if series is shown
+        if (this.chart.Series.Any(s => s != series && s.Points.Count > 0)) {
+          ClearPointsQuick(series.Points);
+        }
+      } else if (Content != null) {
+        List<double> residuals;
+        if (seriesResiduals.TryGetValue(series.Name, out residuals)) {
+          UpdateSeries(residuals, series);
+          chart.Legends[series.Legend].ForeColor = Color.Black;
+          chart.Refresh();
+        }
+      }
+    }
+
+    // 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();
+    }
   }
 }