fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-27 15:53:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'quaternion'

Browse Source 
Conflicts:
	test/attitude.cpp
This commit is contained in:
James Goppert
2016-01-11 21:59:28 -06:00
parent 0e48d2596c cc1658db15
commit 684a6b626d
5 changed files with 167 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
matrix/Matrix.hpp
+6 -6
View File
@@ -365,8 +365,8 @@ public:
Matrix<Type, M, N> abs()
{
Matrix<Type, M, N> r;
for (int i=0; i<M; i++) {
for (int j=0; j<M; j++) {
for (size_t i=0; i<M; i++) {
for (size_t j=0; j<M; j++) {
r(i,j) = Type(fabs((*this)(i,j)));
}
}
@@ -376,8 +376,8 @@ public:
Type max()
{
Type max_val = (*this)(0,0);
for (int i=0; i<M; i++) {
for (int j=0; j<M; j++) {
for (size_t i=0; i<M; i++) {
for (size_t j=0; j<M; j++) {
Type val = (*this)(i,j);
if (val > max_val) {
max_val = val;
@@ -390,8 +390,8 @@ public:
Type min()
{
Type min_val = (*this)(0,0);
for (int i=0; i<M; i++) {
for (int j=0; j<M; j++) {
for (size_t i=0; i<M; i++) {
for (size_t j=0; j<M; j++) {
Type val = (*this)(i,j);
if (val < min_val) {
min_val = val;