Changeset 13820 for branches

Timestamp:

05/02/16 14:58:57 (9 years ago)

Author:

bburlacu

Message:

#2597: Added flags for controlling the display of legend, axis labels, or vertical cursor on the chart.

Location:

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

Files:

• GradientChart.cs (modified) (13 diffs)
• RegressionSolutionTargetResponseGradientView.cs (modified) (1 diff)

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

@@ -32 +32 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   public partial class GradientChart : EnhancedChart {
-    private ModifiableDataset internalDataset;
+    private ModifiableDataset dataset;
 
     public bool ShowLegend { get; set; }
+    public bool ShowXAxisLabel { get; set; }
+    public bool ShowYAxisLabel { get; set; }
+    public bool ShowCursor { get; set; }
 
     private bool useMedianValues;
@@ -98 +101 @@
           throw new ArgumentException("The problem data provided does not contain all the variables required by the solutions.");
         problemData = value;
-        UpdateInternalDataset();
+        UpdateDataset();
         UpdateChart();
       }
@@ -178 +181 @@
       this.points = points;
 
-      UpdateInternalDataset();
+      UpdateDataset();
       UpdateChart();
     }
@@ -188 +191 @@
       this.problemData = pd;
       this.variable = variable;
-      this.internalDataset = dataset;
+      this.dataset = dataset;
       this.min = min;
       this.max = max;
@@ -196 +199 @@
     public void UpdateChart() {
       // throw exceptions?
-      if (internalDataset == null || solutionList == null || !solutionList.Any())
+      if (dataset == null || solutionList == null || !solutionList.Any())
         return;
       if (min.IsAlmost(max) || min > max || points == 0)
         return;
       Series.Clear();
-      var vla = VerticalLineAnnotation;
-      vla.Visible = true;
       Annotations.Clear();
-      Annotations.Add(vla);
+
+      var defaultValue = dataset.GetDoubleValue(variable, 0);
+      if (ShowCursor) {
+        var vla = VerticalLineAnnotation;
+        vla.Visible = true;
+        Annotations.Add(vla);
+        vla.X = defaultValue;
+      }
+
       double axisMin, axisMax, axisInterval;
       // calculate X-axis interval
@@ -218 +227 @@
         series.Name = Target + " " + i;
         Series.Add(series);
-        var p = series.Points.Last();
-        vla.X = p.XValue;
       }
       // calculate Y-axis interval
@@ -232 +239 @@
       axis.Maximum = axisMax;
       axis.Interval = axisInterval;
-      ChartAreas[0].AxisX.Title = Variable + " : " + vla.X.ToString("N3", CultureInfo.CurrentCulture); // set axis titlet
+
+      if (ShowXAxisLabel) {
+        ChartAreas[0].AxisX.Title = Variable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture); // set axis title
+      }
+
       AddStripLines(); // add strip lines
       if (ShowLegend)
@@ -238 +249 @@
     }
 
-    private void UpdateInternalDataset() {
+    private void UpdateDataset() {
       var variables = ProblemData.Dataset.DoubleVariables.ToList();
       var variableValues = new List<double>[variables.Count];
@@ -253 +264 @@
         }
       }
-      internalDataset = new ModifiableDataset(variables, variableValues);
+      dataset = new ModifiableDataset(variables, variableValues);
     }
 
     private double GetEstimatedValue(IRegressionSolution solution, double x) {
-      var v = internalDataset.GetDoubleValue(Variable, 0);
-      internalDataset.SetVariableValue(x, Variable, 0);
-      var y = solution.Model.GetEstimatedValues(internalDataset, new[] { 0 }).Single();
-      internalDataset.SetVariableValue(v, Variable, 0);
+      var v = dataset.GetDoubleValue(Variable, 0);
+      dataset.SetVariableValue(x, Variable, 0);
+      var y = solution.Model.GetEstimatedValues(dataset, new[] { 0 }).Single();
+      dataset.SetVariableValue(v, Variable, 0);
       return y;
     }
 
     private Series PlotSeries(IRegressionSolution solution) {
-      var v = internalDataset.GetDoubleValue(variable, 0);
+      var v = dataset.GetDoubleValue(variable, 0);
       var series = new Series { ChartType = SeriesChartType.Point };
 
       var step = (max - min) / points;
       var axisX = ChartAreas[0].AxisX;
-      axisX.Title = Variable + " : " + v.ToString("N3", CultureInfo.CurrentCulture);
+      if (ShowXAxisLabel) {
+        axisX.Title = Variable + " : " + v.ToString("N3", CultureInfo.CurrentCulture);
+      }
       var axisY = ChartAreas[0].AxisY;
-      axisY.Title = Target;
+      if (ShowYAxisLabel) { axisY.Title = Target; }
       double y;
       // lefthand section outside of the training range
@@ -290 +303 @@
       }
 
-      y = GetEstimatedValue(solution, v);
-      series.Points.Add(new DataPoint(v, y) { MarkerSize = 5, MarkerColor = Color.Red });
-      series.IsVisibleInLegend = true;
+      if (ShowCursor) {
+        y = GetEstimatedValue(solution, v);
+        series.Points.Add(new DataPoint(v, y) { MarkerSize = 5, MarkerColor = Color.Red });
+      }
+      if (ShowLegend) {
+        series.IsVisibleInLegend = true;
+      }
 
       return series;
@@ -340 +357 @@
       var annotation = VerticalLineAnnotation;
       var x = annotation.X;
-      internalDataset.SetVariableValue(x, Variable, 0);
+      dataset.SetVariableValue(x, Variable, 0);
       for (int i = 0; i < solutionList.Count; ++i) {
         var y = GetEstimatedValue(solutionList[i], x);
@@ -347 +364 @@
         s.Points[n - 1] = new DataPoint(x, y) { MarkerColor = Color.Red, MarkerSize = 5 };
       }
-      ChartAreas[0].AxisX.Title = Variable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+      if (ShowXAxisLabel) {
+        ChartAreas[0].AxisX.Title = Variable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+      }
       Update();
       OnVariableValueChanged(this, EventArgs.Empty);
@@ -360 +379 @@
       if (e.NewLocationX < axisX.Minimum)
         e.NewLocationX = axisX.Minimum;
-      //      var x = e.NewLocationX;
-      //      internalDataset.SetVariableValue(x, Variable, 0);
-      //      for (int i = 0; i < solutionList.Count; ++i) {
-      //        var y = GetEstimatedValue(solutionList[i], x);
-      //        var s = Series[i];
-      //        var n = s.Points.Count;
-      //        s.Points[n - 1] = new DataPoint(x, y) { MarkerColor = Color.Red, MarkerSize = 5 };
-      //      }
-      //      ChartAreas[0].AxisX.Title = Variable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
-      //      Update();
-      //      OnVariableValueChanged(this, EventArgs.Empty);
     }
 

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

@@ -80 +80 @@
           if (v < min) min = v;
         }
-        var gradientChart = new GradientChart { Dock = DockStyle.Fill, ShowLegend = false, Margin = Padding.Empty };
+        var gradientChart = new GradientChart {
+          Dock = DockStyle.Fill,
+          Margin = Padding.Empty,
+          ShowLegend = false,
+          ShowCursor = true,
+          ShowXAxisLabel = true,
+          ShowYAxisLabel = true
+        };
         gradientChart.VariableValueChanged += (o, e) => {
           foreach (var chart in gradientChartTableLayout.Controls.Cast<GradientChart>()) {