Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-06-02 11:59:17 +08:00
Code Issues Actions 21 Packages Projects Releases Wiki Activity

add braces around statements and cleanup formatting (#107)

Browse Source
This commit is contained in:
Daniel Agar
2019-11-13 13:41:38 -05:00
committed by Julian Kent
parent 38e966cea1
commit cd185c995b
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrix/Matrix.hpp
+12 -4
View File
@@ -588,8 +588,12 @@ Type min(const Type x, const Type y) {
bool y_is_nan = isnan(y);
// z > nan for z != nan is required by C the standard
if (x_is_nan || y_is_nan) {
if(x_is_nan && !y_is_nan) return y;
if(!x_is_nan && y_is_nan) return x;
if (x_is_nan && !y_is_nan) {
return y;
}
if (!x_is_nan && y_is_nan) {
return x;
}
return x;
}
return (x < y) ? x : y;
@@ -600,8 +604,12 @@ Type max(const Type x, const Type y) {
bool y_is_nan = isnan(y);
// z > nan for z != nan is required by C the standard
if (x_is_nan || y_is_nan) {
if(x_is_nan && !y_is_nan) return y;
if(!x_is_nan && y_is_nan) return x;
if (x_is_nan && !y_is_nan) {
return y;
}
if (!x_is_nan && y_is_nan) {
return x;
}
return x;
}
return (x > y) ? x : y;