Changeset 11425 for stable

Timestamp:

10/08/14 10:47:34 (10 years ago)

Author:

gkronber

Message:

#2216 merged r11367 from trunk to stable

Location:

stable

Files:

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

stable/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);