Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-28 19:32:36 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Matrix: omit min max nan case with same result

Browse Source 
I observed this during review in
https://github.com/PX4/Matrix/pull/105/files#r348386226
This commit is contained in:
Matthias Grob
2020-03-21 15:22:11 +01:00
committed by Julian Kent
parent a32892926c
commit fa7153ecfb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrix/Matrix.hpp
+2 -6
View File
@@ -620,9 +620,7 @@ Type min(const Type x, const Type y) {
if (x_is_nan && !y_is_nan) { if (x_is_nan && !y_is_nan) {
return y; return y;
} }
if (!x_is_nan && y_is_nan) { // either !x_is_nan && y_is_nan or both are NAN anyways
return x;
}
return x; return x;
} }
return (x < y) ? x : y; return (x < y) ? x : y;
@@ -636,9 +634,7 @@ Type max(const Type x, const Type y) {
if (x_is_nan && !y_is_nan) { if (x_is_nan && !y_is_nan) {
return y; return y;
} }
if (!x_is_nan && y_is_nan) { // either !x_is_nan && y_is_nan or both are NAN anyways
return x;
}
return x; return x;
} }
return (x > y) ? x : y; return (x > y) ? x : y;