Changeset 11367 for trunk/sources

Timestamp:

09/15/14 12:46:48 (10 years ago)

Author:

gkronber

Message:

#2216 fixed a bug in the display of the baseline curve in the error characteristic curve view and simplified code.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (2 diffs)

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

@@ -105 +105 @@
 
       if (Content.ProblemData.TrainingIndices.Any()) {
-        var constantModel = CreateConstantModel();
-        var originalValues = GetOriginalValues().ToList();
-        var baselineEstimatedValues = GetEstimatedValues(constantModel);
-        var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
-
-        Series baselineSeries = new Series("Baseline");
-        baselineSeries.ChartType = SeriesChartType.FastLine;
-        UpdateSeries(baselineResiduals, baselineSeries);
-        baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
-        baselineSeries.Tag = constantModel;
-        baselineSeries.LegendToolTip = "Double-click to open model";
-        chart.Series.Add(baselineSeries);
+        AddRegressionSolution(CreateConstantSolution());
       }
 
@@ -239 +228 @@
     }
 
-    private IRegressionSolution CreateConstantModel() {
+    private ConstantRegressionSolution CreateConstantSolution() {
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).Average();
       var model = new ConstantRegressionModel(averageTrainingTarget);