Changeset 11205 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

Timestamp:

07/18/14 13:44:53 (10 years ago)

Author:

ascheibe

Message:

merged rest of trunk into hive statistics branch

Location:

branches/HiveStatistics/sources

Files:

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

branches/HiveStatistics/sources

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll

branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -52 +52 @@
       chart.ChartAreas[0].CursorX.Interval = 0.01;
 
-      chart.ChartAreas[0].AxisY.Title = "Number of Samples";
+      chart.ChartAreas[0].AxisY.Title = "Ratio of Residuals";
       chart.ChartAreas[0].AxisY.Minimum = 0.0;
       chart.ChartAreas[0].AxisY.Maximum = 1.0;
@@ -99 +99 @@
       chart.Series.Clear();
       chart.Annotations.Clear();
+
       if (Content == null) return;
-
-      var constantModel = CreateConstantModel();
-      var originalValues = GetOriginalValues().ToList();
-      var baselineEstimatedValues = GetEstimatedValues(constantModel);
-      var baselineResiduals = GetResiduals(originalValues, baselineEstimatedValues);
-
-      baselineResiduals.Sort();
-      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(baselineResiduals.Last());
-      chart.ChartAreas[0].CursorX.Interval = baselineResiduals.First() / 100;
-
-      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);
+      if (cmbSamples.SelectedItem.ToString() == TrainingSamples && !ProblemData.TrainingIndices.Any()) return;
+      if (cmbSamples.SelectedItem.ToString() == TestSamples && !ProblemData.TestIndices.Any()) return;
+
+      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(Content);
@@ -127 +128 @@
       solutionSeries.Tag = solution;
       solutionSeries.ChartType = SeriesChartType.FastLine;
-      var estimatedValues = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
-      UpdateSeries(estimatedValues, solutionSeries);
+      var residuals = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
+      
+      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(residuals.Max());
+      chart.ChartAreas[0].CursorX.Interval = residuals.Min() / 100;
+
+      UpdateSeries(residuals, solutionSeries);
+
       solutionSeries.ToolTip = "Area over Curve: " + CalculateAreaOverCurve(solutionSeries);
       solutionSeries.LegendToolTip = "Double-click to open model";
@@ -236 +242 @@
       double averageTrainingTarget = ProblemData.Dataset.GetDoubleValues(ProblemData.TargetVariable, ProblemData.TrainingIndices).Average();
       var model = new ConstantRegressionModel(averageTrainingTarget);
-      var solution = new ConstantRegressionSolution(model,(IRegressionProblemData)ProblemData.Clone());
+      var solution = new ConstantRegressionSolution(model, (IRegressionProblemData)ProblemData.Clone());
       solution.Name = "Baseline";
       return solution;

@@ -8 +8 @@
 FxCopResults.txt
 Google.ProtocolBuffers-0.9.1.dll
+Google.ProtocolBuffers-2.4.1.473.dll
 HeuristicLab 3.3.5.1.ReSharper.user
 HeuristicLab 3.3.6.0.ReSharper.user
 HeuristicLab.4.5.resharper.user
 HeuristicLab.ExtLibs.6.0.ReSharper.user
+HeuristicLab.Scripting.Development
 HeuristicLab.resharper.user
 ProtoGen.exe
@@ -17 +19 @@
 _ReSharper.HeuristicLab
 _ReSharper.HeuristicLab 3.3
+_ReSharper.HeuristicLab 3.3 Tests
 _ReSharper.HeuristicLab.ExtLibs
 bin
 protoc.exe
-_ReSharper.HeuristicLab 3.3 Tests
-Google.ProtocolBuffers-2.4.1.473.dll