Changeset 13845

Timestamp:

05/11/16 17:17:04 (8 years ago)

Author:

pfleck

Message:

#2597

• All used variables of a model are initially checked when opening the Target Response Gradient View.
• Fixed a bug on axis scaling.

Location:

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

Files:

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

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

@@ -278 +278 @@
       axis.Interval = (axis.Maximum - axis.Minimum) / ticks;
 
-      chart.ChartAreas[0].RecalculateAxesScale();
+      try {
+        chart.ChartAreas[0].RecalculateAxesScale();
+      }
+      catch (InvalidOperationException) {
+        // Can occur if eg. axis min == axis max
+      }
     }
 

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

@@ -65 +65 @@
       var problemData = Content.ProblemData;
       // create dataset
-      var variableNames = Content.GetUsedVariablesForPrediction().ToList();
-      var variableValues = variableNames.Select(x => new List<double> { problemData.Dataset.GetDoubleValues(x, problemData.TrainingIndices).Median() });
-      var sharedFixedVariables = new ModifiableDataset(variableNames, variableValues);
+      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);
       // create charts
       charts.Clear();
-      foreach (var variableName in variableNames) {
+      foreach (var variableName in allowedInputVariables) {
         var gradientChart = new GradientChart {
           Dock = DockStyle.Fill,
@@ -94 +94 @@
       // update variable list
       variableListView.Items.Clear();
-      variableListView.Items.AddRange(variableNames.Select(x => new ListViewItem(x, 0)).ToArray());
+      foreach (var variable in allowedInputVariables)
+        variableListView.Items.Add(key: variable, text: variable, imageIndex: 0);
+
+      foreach (var variable in Content.GetUsedVariablesForPrediction())
+        variableListView.Items[variable].Checked = true;
     }