Changeset 12505 for branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

Timestamp:

06/25/15 11:26:25 (9 years ago)

Author:

mkommend

Message:

#2276: Merged trunk changes into dataset refactoring branch.

Location:

branches/HeuristicLab.DatasetRefactor/sources

Files:

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

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

@@ -25 +25 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 
@@ -45 +46 @@
       cmbSamples.SelectedIndex = 0;
 
+      residualComboBox.SelectedIndex = 0;
+
       chart.CustomizeAllChartAreas();
-      chart.ChartAreas[0].AxisX.Title = "Absolute Error";
+      chart.ChartAreas[0].AxisX.Title = residualComboBox.SelectedItem.ToString();
       chart.ChartAreas[0].AxisX.Minimum = 0.0;
       chart.ChartAreas[0].AxisX.Maximum = 0.0;
@@ -109 +112 @@
 
       AddRegressionSolution(Content);
+
+      chart.ChartAreas[0].AxisX.Title = residualComboBox.SelectedItem.ToString();
     }
 
@@ -119 +124 @@
       var residuals = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
 
-
       var maxValue = residuals.Max();
-      if (maxValue >= chart.ChartAreas[0].AxisX.Maximum) {
-        double scale = Math.Pow(10, Math.Floor(Math.Log10(maxValue)));
-        var maximum = scale * (1 + (int)(maxValue / scale));
-        chart.ChartAreas[0].AxisX.Maximum = maximum;
-      }
+      double scale = Math.Pow(10, Math.Floor(Math.Log10(maxValue)));
+      var maximum = scale * (1 + (int)(maxValue / scale));
+      chart.ChartAreas[0].AxisX.Maximum = maximum;
       chart.ChartAreas[0].CursorX.Interval = residuals.Min() / 100;
 
@@ -203 +205 @@
 
     protected virtual List<double> GetResiduals(IEnumerable<double> originalValues, IEnumerable<double> estimatedValues) {
-      return originalValues.Zip(estimatedValues, (x, y) => Math.Abs(x - y)).ToList();
+      switch (residualComboBox.SelectedItem.ToString()) {
+        case "Absolute error": return originalValues.Zip(estimatedValues, (x, y) => Math.Abs(x - y)).ToList();
+        case "Squared error": return originalValues.Zip(estimatedValues, (x, y) => (x - y) * (x - y)).ToList();
+        case "Relative error": return originalValues.Zip(estimatedValues, (x, y) => x.IsAlmost(0.0) ? -1 : Math.Abs((x - y) / x))
+          .Where(x => x > 0) // remove entries where the original value is 0
+          .ToList();
+      }
+      // should never happen
+      return new List<double>();
     }
 
@@ -251 +261 @@
       }
     }
+
+    private void residualComboBox_SelectedIndexChanged(object sender, EventArgs e) {
+      UpdateChart();
+    }
   }
 }