Browse Source

Fix regression in least_squares_fit.cpp

Scott Lahteine 8 years ago
parent
commit
11b6a3cbb6
1 changed files with 3 additions and 4 deletions
  1. 3
    4
      Marlin/least_squares_fit.cpp

+ 3
- 4
Marlin/least_squares_fit.cpp View File

@@ -69,10 +69,9 @@ int finish_incremental_LSF(struct linear_fit_data *lsf) {
69 69
   lsf->x2bar = lsf->x2bar / N - sq(lsf->xbar);
70 70
   lsf->y2bar = lsf->y2bar / N - sq(lsf->ybar);
71 71
   lsf->z2bar = lsf->z2bar / N - sq(lsf->zbar);
72
-  lsf->xybar = lsf->xybar / N - sq(lsf->xbar);
73
-  lsf->yzbar = lsf->yzbar / N - sq(lsf->ybar);
74
-  lsf->xzbar = lsf->xzbar / N - sq(lsf->xbar);
75
-
72
+  lsf->xybar = lsf->xybar / N - lsf->xbar * lsf->ybar;
73
+  lsf->yzbar = lsf->yzbar / N - lsf->ybar * lsf->zbar;
74
+  lsf->xzbar = lsf->xzbar / N - lsf->xbar * lsf->zbar;
76 75
   const float DD = lsf->x2bar * lsf->y2bar - sq(lsf->xybar);
77 76
   if (fabs(DD) <= 1e-10 * (lsf->max_absx + lsf->max_absy))
78 77
     return -1;

Loading…
Cancel
Save