Changeset 15789 for trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

02/20/18 11:20:58 (7 years ago)

Author:

fholzing

Message:

#2383: Added additional filter for Error Characteristics Curve

File:

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

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

@@ -164 +164 @@
       solutionSeries.ChartType = SeriesChartType.FastLine;
       var residuals = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
+      residuals.Remove(double.NaN);
+      residuals.Remove(double.NegativeInfinity);
+      residuals.Remove(double.PositiveInfinity);
 
       var maxValue = residuals.Max();
@@ -251 +254 @@
         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();
+        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();
         default: throw new NotSupportedException();
       }