Changeset 11425


Ignore:
Timestamp:
10/08/14 10:47:34 (5 years ago)
Author:
gkronber
Message:

#2216 merged r11367 from trunk to stable

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

    r11170 r11425  
    105105
    106106      if (Content.ProblemData.TrainingIndices.Any()) {
    107         var constantModel = CreateConstantModel();
    108         var originalValues = GetOriginalValues().ToList();
    109         var baselineEstimatedValues = GetEstimatedValues(constantModel);
    110         var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
    111 
    112         Series baselineSeries = new Series("Baseline");
    113         baselineSeries.ChartType = SeriesChartType.FastLine;
    114         UpdateSeries(baselineResiduals, baselineSeries);
    115         baselineSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(baselineSeries);
    116         baselineSeries.Tag = constantModel;
    117         baselineSeries.LegendToolTip = "Double-click to open model";
    118         chart.Series.Add(baselineSeries);
     107        AddRegressionSolution(CreateConstantSolution());
    119108      }
    120109
     
    239228    }
    240229
    241     private IRegressionSolution CreateConstantModel() {
     230    private ConstantRegressionSolution CreateConstantSolution() {
    242231      double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).Average();
    243232      var model = new ConstantRegressionModel(averageTrainingTarget);
Note: See TracChangeset for help on using the changeset viewer.