Changeset 15097 for stable/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs

Timestamp:

06/30/17 16:41:06 (7 years ago)

Author:

pfleck

Message:

#2713 #2715 #2765
Merged to stable

• 14435-14439,14493,14516,14519,14982,14987,14992,15042 (from #2713)
• 14457-14458,14508,14582,14740,14984,15068,15095 (from #2715)
• 14860-14861 (from #2765)

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs (copied) (copied from trunk/sources/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs) (4 diffs)

stable/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs

@@ -571 +571 @@
 
       double[] coefficients;
-      if (!Fitting(row, out coefficients))
+      if (!Fitting(row, out coefficients)) {
+        regressionSeries.LegendToolTip = "Could not calculate regression.";
         return;
+      }
 
       // Fill regrssion series
-      var validPoints = row.Points.Where(p => !IsInvalidValue(p.X));
-      double min = validPoints.Min(p => p.X), max = validPoints.Max(p => p.X);
-      double range = max - min, delta = range / row.Points.Count;
-      for (double x = min; x < max; x += delta) {
-        regressionSeries.Points.AddXY(x, Estimate(x, row, coefficients));
+      double min = row.Points.Min(p => p.X), max = row.Points.Max(p => p.X);
+      double range = max - min, delta = range / Math.Max(row.Points.Count - 1, 50);
+      if (range > double.Epsilon) {
+        for (double x = min; x <= max; x += delta) {
+          regressionSeries.Points.AddXY(x, Estimate(x, row, coefficients));
+        }
       }
 
@@ -657 +660 @@
 
     protected static bool Fitting(ScatterPlotDataRow row, out double[] coefficients) {
+      if (!IsValidRegressionData(row)) {
+        coefficients = new double[0];
+        return false;
+      }
+
       var xs = row.Points.Select(p => p.X).ToList();
       var ys = row.Points.Select(p => p.Y).ToList();
@@ -688 +696 @@
       // Linear fitting
       bool success = LinearFitting(matrix, nRows, out coefficients);
-      if (!success) return success;
+      if (!success) return false;
 
       // Output transformation
@@ -698 +706 @@
       }
 
+      return true;
+    }
+    protected static bool IsValidRegressionData(ScatterPlotDataRow row) {
+      // No invalid values allowed
+      for (int i = 0; i < row.Points.Count; i++) {
+        if (IsInvalidValue(row.Points[i].X) || IsInvalidValue(row.Points[i].Y))
+          return false;
+      }
+      // Exp, Power and Log Regression do not work with negative values
+      switch (row.VisualProperties.RegressionType) {
+        case ScatterPlotDataRowVisualProperties.ScatterPlotDataRowRegressionType.Exponential:
+          for (int i = 0; i < row.Points.Count; i++) {
+            if (row.Points[i].Y <= 0)
+              return false;
+          }
+          break;
+        case ScatterPlotDataRowVisualProperties.ScatterPlotDataRowRegressionType.Power:
+          for (int i = 0; i < row.Points.Count; i++) {
+            if (row.Points[i].X <= 0 || row.Points[i].Y <= 0)
+              return false;
+          }
+          break;
+        case ScatterPlotDataRowVisualProperties.ScatterPlotDataRowRegressionType.Logarithmic:
+          for (int i = 0; i < row.Points.Count; i++) {
+            if (row.Points[i].X <= 0)
+              return false;
+          }
+          break;
+      }
       return true;
     }