Changeset 14987 for trunk

Timestamp:

05/16/17 12:53:53 (8 years ago)

Author:

pfleck

Message:

#2713

• Fixed problems with negative values for some regression types.
• Fixed issue where the regression line was not drawn up to the last point.
• Tool strip now reads "Configure Chart...".

Location:

trunk/sources/HeuristicLab.Analysis.Views/3.3

Files:

• DataTableView.Designer.cs (modified) (1 diff)
• ScatterPlotView.Designer.cs (modified) (2 diffs)
• ScatterPlotView.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.Designer.cs

@@ -107 +107 @@
       this.configureToolStripMenuItem.Name = "configureToolStripMenuItem";
       this.configureToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-      this.configureToolStripMenuItem.Text = "Configure Chart";
+      this.configureToolStripMenuItem.Text = "Configure Chart...";
       this.configureToolStripMenuItem.Click += new System.EventHandler(this.configureToolStripMenuItem_Click);
       // 

trunk/sources/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.Designer.cs

@@ -69 +69 @@
       // chart
       // 
-      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.chart.BorderlineColor = System.Drawing.Color.Black;
@@ -107 +107 @@
       this.configureToolStripMenuItem.Name = "configureToolStripMenuItem";
       this.configureToolStripMenuItem.Size = new System.Drawing.Size(256, 22);
-      this.configureToolStripMenuItem.Text = "Configure Chart";
+      this.configureToolStripMenuItem.Text = "Configure Chart...";
       this.configureToolStripMenuItem.Click += new System.EventHandler(this.configureToolStripMenuItem_Click);
       // 

trunk/sources/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) {
+      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);
+      for (double x = min; x <= max; x += delta) {
         regressionSeries.Points.AddXY(x, Estimate(x, row, coefficients));
       }
@@ -657 +658 @@
 
     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 +694 @@
       // Linear fitting
       bool success = LinearFitting(matrix, nRows, out coefficients);
-      if (!success) return success;
+      if (!success) return false;
 
       // Output transformation
@@ -698 +704 @@
       }
 
+      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;
     }