Changeset 14486 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs

Timestamp:

12/13/16 12:30:39 (7 years ago)

Author:

gkronber

Message:

#2718: fixed residual line chart view

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionResidualsLineChartView.cs) (1 diff)

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Line Chart (residuals)")]
+  [View("Line Chart")]
   [Content(typeof(IRegressionSolution))]
-  public partial class RegressionSolutionResidualsLineChartView : RegressionSolutionLineChartView, IDataAnalysisSolutionEvaluationView {
+  public partial class RegressionSolutionLineChartView : RegressionSolutionLineChartViewBase {
 
 
-    public RegressionSolutionResidualsLineChartView()
+    public RegressionSolutionLineChartView()
       : base() {
       InitializeComponent();
     }
 
-    protected override void GetTrainingSeries(out int[] x, out double[] y) {
-      base.GetTrainingSeries(out x, out y);
-      var problemData = Content.ProblemData;
-      var target = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, x).ToArray();
-      for (int i = 0; i < x.Length; i++) {
-        y[i] -= target[i];
-      }
+    protected override void GetTrainingSeries(out int[] idx, out double[] y) {
+      idx = Content.ProblemData.TrainingIndices.ToArray();
+      y = Content.EstimatedTrainingValues.ToArray();
     }
 
-    protected override void GetTestSeries(out int[] x, out double[] y) {
-      base.GetTestSeries(out x, out y);
-      var problemData = Content.ProblemData;
-      var target = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, x).ToArray();
-      for (int i = 0; i < x.Length; i++) {
-        y[i] -= target[i];
-      }
+    protected override void GetTestSeries(out int[] idx, out double[] y) {
+      idx = Content.ProblemData.TestIndices.ToArray();
+      y = Content.EstimatedTestValues.ToArray();
     }
 
-    protected override void GetAllValuesSeries(out int[] x, out double[] y) {
-      base.GetAllValuesSeries(out x, out y);
-      var problemData = Content.ProblemData;
-      var target = problemData.Dataset.GetDoubleValues(problemData.TargetVariable, x).ToArray();
-      for (int i = 0; i < x.Length; i++) {
-        y[i] -= target[i];
-      }
+    protected override void GetAllValuesSeries(out int[] idx, out double[] y) {
+      idx = Content.ProblemData.AllIndices.ToArray();
+      y = Content.EstimatedValues.ToArray();
     }
-
-    protected override void RedrawChart() {
-      base.RedrawChart();
-      UpdateSeriesStyle();
-    }
-
-    private void UpdateSeriesStyle() {
-      base.chart.Series[RegressionSolutionLineChartView.ESTIMATEDVALUES_TRAINING_SERIES_NAME].YAxisType = AxisType.Secondary;
-      base.chart.Series[RegressionSolutionLineChartView.ESTIMATEDVALUES_TEST_SERIES_NAME].YAxisType = AxisType.Secondary;
-      base.chart.Series[RegressionSolutionLineChartView.ESTIMATEDVALUES_ALL_SERIES_NAME].YAxisType = AxisType.Secondary;
-    }
-
   }
 }