From b8ba3b764722b8ce81fa791c0ec4ca8a3cf315d1 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Tue, 2 May 2017 18:51:23 -0500
Subject: [PATCH] Use 'sq' macro where possible
---
Marlin/least_squares_fit.cpp | 12 ++++++------
Marlin/vector_3.cpp | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Marlin/least_squares_fit.cpp b/Marlin/least_squares_fit.cpp
index ce21b3a053..a6fb3c4457 100644
--- a/Marlin/least_squares_fit.cpp
+++ b/Marlin/least_squares_fit.cpp
@@ -66,12 +66,12 @@ int finish_incremental_LSF(struct linear_fit_data *lsf) {
lsf->xbar /= N;
lsf->ybar /= N;
lsf->zbar /= N;
- lsf->x2bar = lsf->x2bar / N - lsf->xbar * lsf->xbar;
- lsf->y2bar = lsf->y2bar / N - lsf->ybar * lsf->ybar;
- lsf->z2bar = lsf->z2bar / N - lsf->zbar * lsf->zbar;
- lsf->xybar = lsf->xybar / N - lsf->xbar * lsf->ybar;
- lsf->yzbar = lsf->yzbar / N - lsf->ybar * lsf->zbar;
- lsf->xzbar = lsf->xzbar / N - lsf->xbar * lsf->zbar;
+ lsf->x2bar = lsf->x2bar / N - sq(lsf->xbar);
+ lsf->y2bar = lsf->y2bar / N - sq(lsf->ybar);
+ lsf->z2bar = lsf->z2bar / N - sq(lsf->zbar);
+ lsf->xybar = lsf->xybar / N - sq(lsf->xbar);
+ lsf->yzbar = lsf->yzbar / N - sq(lsf->ybar);
+ lsf->xzbar = lsf->xzbar / N - sq(lsf->xbar);
const float DD = lsf->x2bar * lsf->y2bar - sq(lsf->xybar);
if (fabs(DD) <= 1e-10 * (lsf->max_absx + lsf->max_absy))
diff --git a/Marlin/vector_3.cpp b/Marlin/vector_3.cpp
index f5aa4576d3..3471fedcac 100644
--- a/Marlin/vector_3.cpp
+++ b/Marlin/vector_3.cpp
@@ -63,7 +63,7 @@ vector_3 vector_3::get_normal() {
return normalized;
}
-float vector_3::get_length() { return sqrt((x * x) + (y * y) + (z * z)); }
+float vector_3::get_length() { return sqrt(sq(x) + sq(y) + sq(z)); }
void vector_3::normalize() {
const float inv_length = 1.0 / get_length();
--
GitLab