Changeset 14267

Timestamp:

08/30/16 16:45:14 (8 years ago)

Author:

pfleck

Message:

#2662

• Show the current y value on the y-axis label.
• Changed format of the x- and y-value to fixed significant digits ("G") instead of fixed decimal digits ("N").

Location:

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

Files:

• Controls/GradientChart.cs (modified) (2 diffs)
• Regression/RegressionSolutionTargetResponseGradientView.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/GradientChart.cs

@@ -283 +283 @@
 
       if (ShowCursor)
-        chart.Titles[0].Text = FreeVariable + " : " + defaultValue.ToString("N3", CultureInfo.CurrentCulture);
+        chart.Titles[0].Text = FreeVariable + " : " + defaultValue.ToString("G5", CultureInfo.CurrentCulture);
 
       ResizeAllSeriesData();
@@ -640 +640 @@
 
       if (ShowCursor) {
-        chart.Titles[0].Text = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+        chart.Titles[0].Text = FreeVariable + " : " + x.ToString("G5", CultureInfo.CurrentCulture);
         chart.Update();
       }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
@@ -37 +38 @@
     private readonly Dictionary<string, DensityChart> densityCharts;
     private readonly Dictionary<string, Panel> groupingPanels;
+    private ModifiableDataset sharedFixedVariables;
 
     private const int Points = 200;
@@ -113 +115 @@
       var allowedInputVariables = Content.ProblemData.AllowedInputVariables;
       var variableValues = allowedInputVariables.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });
-      var sharedFixedVariables = new ModifiableDataset(allowedInputVariables, variableValues);
+      if (sharedFixedVariables != null)
+        sharedFixedVariables.ItemChanged += SharedFixedVariables_ItemChanged;
+      sharedFixedVariables = new ModifiableDataset(allowedInputVariables, variableValues);
+      // ItemChanged eventhandler is registered later, after creating the gradient charts
 
       // create controls
@@ -170 +175 @@
       variableListView.ItemChecked += variableListView_ItemChecked;
 
+      sharedFixedVariables.ItemChanged += SharedFixedVariables_ItemChanged;
+
       RecalculateAndRelayoutCharts();
+    }
+
+    private void SharedFixedVariables_ItemChanged(object sender, EventArgs<int, int> e) {
+      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) {
+        if (!string.IsNullOrEmpty(chart.YAxisTitle)) { // only show title for first column in grid
+          chart.YAxisTitle = title;
+        }
+      }
     }
 
@@ -257 +274 @@
       tl.Controls.Clear();
       int row = 0, column = 0;
+      double yValue = Content.Model.GetEstimatedValues(sharedFixedVariables, new[] { 0 }).Single();
+      string title = Content.ProblemData.TargetVariable + ": " + yValue.ToString("G5", CultureInfo.CurrentCulture);
+
       foreach (var v in VisibleVariables) {
         var chartsPanel = groupingPanels[v];
@@ -262 +282 @@
 
         var chart = gradientCharts[v];
-        chart.YAxisTitle = column == 0 ? Content.ProblemData.TargetVariable : string.Empty;
+        chart.YAxisTitle = column == 0 ? title : string.Empty;
         column++;