From 9c1c1d8674f714eb6cc1843ed9b642d5a8022ada Mon Sep 17 00:00:00 2001
From: Bryant Mairs <bwmairs@ucsc.edu>
Date: Thu, 12 Apr 2012 23:38:19 -0700
Subject: [PATCH] Needed to remove debugging/test code before committing.
 Whoops. Also changed calculateRegression(...) to return a bool, as that's all
 it needs.

---
 src/ui/QGCDataPlot2D.cc | 23 +++++++++--------------
 src/ui/QGCDataPlot2D.h  |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/ui/QGCDataPlot2D.cc b/src/ui/QGCDataPlot2D.cc
index d23a56d4e..9013ea3fd 100644
--- a/src/ui/QGCDataPlot2D.cc
+++ b/src/ui/QGCDataPlot2D.cc
@@ -560,11 +560,8 @@ void QGCDataPlot2D::loadCsvLog(QString file, QString xAxisName, QString yAxisFil
 
 bool QGCDataPlot2D::calculateRegression()
 {
-    // TODO Add support for quadratic / cubic curve fitting
-	qDebug() << ui->xRegressionComboBox->currentText();
-	qDebug() << ui->yRegressionComboBox->currentText();
-    //return false;
-	return calculateRegression(ui->xRegressionComboBox->currentText(), ui->yRegressionComboBox->currentText(), "quadratic");
+    // TODO: Add support for quadratic / cubic curve fitting
+	return calculateRegression(ui->xRegressionComboBox->currentText(), ui->yRegressionComboBox->currentText(), "linear");
 }
 
 /**
@@ -597,8 +594,7 @@ bool QGCDataPlot2D::calculateRegression(QString xName, QString yName, QString me
             double a;  // Y-axis crossing
             double b;  // Slope
             double r;  // Regression coefficient
-            int lin = linearRegression(x, y, copied, &a, &b, &r);
-            if(lin == 1) {
+            if (linearRegression(x, y, copied, &a, &b, &r)) {
                 function = tr("%1 = %2 * %3 + %4 | R-coefficient: %5").arg(yName, QString::number(b), xName, QString::number(a), QString::number(r));
 
                 // Plot curve
@@ -608,14 +604,13 @@ bool QGCDataPlot2D::calculateRegression(QString xName, QString yName, QString me
                 plot->setStyleText("lines");
                 // x-value of the current rightmost x position in the plot
                 plot->appendData(tr("regression %1-%2").arg(xName, yName), plot->invTransform(QwtPlot::xBottom, plot->width() - plot->width()*0.08f), (a + b*plot->invTransform(QwtPlot::xBottom, plot->width() - plot->width() * 0.08f)));
-                result = true;
+                
+				result = true;
             } else {
                 function = tr("Linear regression failed. (Limit: %1 data points. Try with less)").arg(size);
-                result = false;
             }
         } else {
             function = tr("Regression method %1 not found").arg(method);
-            result = false;
         }
 
 		delete x, y;
@@ -642,7 +637,7 @@ bool QGCDataPlot2D::calculateRegression(QString xName, QString yName, QString me
  *          the match of the regression.
  * @return 1 on success, 0 on failure (e.g. because of infinite slope)
  */
-int QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, double *b, double *r)
+bool QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, double *b, double *r)
 {
     int i;
     double sumx=0,sumy=0,sumx2=0,sumy2=0,sumxy=0;
@@ -652,7 +647,7 @@ int QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, doub
     *b = 0;
     *r = 0;
     if (n < 2)
-        return(FALSE);
+        return true;
 
     /* Conpute some things we need */
     for (i=0; i<n; i++) {
@@ -668,7 +663,7 @@ int QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, doub
 
     /* Infinite slope (b), non existant intercept (a) */
     if (fabs(sxx) == 0)
-        return(FALSE);
+        return false;
 
     /* Calculate the slope (b) and intercept (a) */
     *b = sxy / sxx;
@@ -680,7 +675,7 @@ int QGCDataPlot2D::linearRegression(double *x, double *y, int n, double *a, doub
     else
         *r = sxy / sqrt(sxx * syy);
 
-    return(TRUE);
+    return false;
 }
 
 void QGCDataPlot2D::saveCsvLog()
diff --git a/src/ui/QGCDataPlot2D.h b/src/ui/QGCDataPlot2D.h
index f87498bba..917390121 100644
--- a/src/ui/QGCDataPlot2D.h
+++ b/src/ui/QGCDataPlot2D.h
@@ -22,7 +22,7 @@ public:
     bool calculateRegression(QString xName, QString yName, QString method="linear");
 
     /** @brief Linear regression over data points */
-    int linearRegression(double* x,double* y,int n,double* a,double* b,double* r);
+    bool linearRegression(double *x, double *y, int n, double *a, double *b, double *r);
 
 public slots:
     /** @brief Load previously selected file */
-- 
2.22.0