dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

applied fix_code_style.sh

This commit is contained in:
Roman Bapst 2014-11-13 11:16:22 +01:00
parent 794a89e711
commit 003b326c77
1 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/lib/mathlib/math/Matrix.hpp
View File

@ -51,10 +51,11 @@
#else
#include <math/eigen_math.h>
#include <Eigen/Eigen>
#define M_PI_2_F 1.5707963267948966192
#define M_PI_2_F 1.5707963267948966192f
#endif
namespace math {
namespace math
{
template<unsigned int M, unsigned int N>
class __EXPORT Matrix;
@ -84,8 +85,7 @@ public:
*/
MatrixBase() :
data {},
arm_mat {M, N, &data[0][0]}
{
arm_mat {M, N, &data[0][0]} {
}
virtual ~MatrixBase() {};
@ -94,20 +94,17 @@ public:
* copyt ctor
*/
MatrixBase(const MatrixBase<M, N> &m) :
arm_mat {M, N, &data[0][0]}
{
arm_mat {M, N, &data[0][0]} {
memcpy(data, m.data, sizeof(data));
}
MatrixBase(const float *d) :
arm_mat {M, N, &data[0][0]}
{
arm_mat {M, N, &data[0][0]} {
memcpy(data, d, sizeof(data));
}
MatrixBase(const float d[M][N]) :
arm_mat {M, N, &data[0][0]}
{
arm_mat {M, N, &data[0][0]} {
memcpy(data, d, sizeof(data));
}
@ -159,8 +156,9 @@ public:
bool operator ==(const Matrix<M, N> &m) const {
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
if (data[i][j] != m.data[i][j])
if (data[i][j] != m.data[i][j]) {
return false;
}
return true;
}
@ -171,8 +169,9 @@ public:
bool operator !=(const Matrix<M, N> &m) const {
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
if (data[i][j] != m.data[i][j])
if (data[i][j] != m.data[i][j]) {
return true;
}
return false;
}
@ -192,8 +191,9 @@ public:
Matrix<M, N> res;
for (unsigned int i = 0; i < N; i++)
for (unsigned int j = 0; j < M; j++)
for (unsigned int j = 0; j < M; j++) {
res.data[i][j] = -data[i][j];
}
return res;
}
@ -205,16 +205,18 @@ public:
Matrix<M, N> res;
for (unsigned int i = 0; i < N; i++)
for (unsigned int j = 0; j < M; j++)
for (unsigned int j = 0; j < M; j++) {
res.data[i][j] = data[i][j] + m.data[i][j];
}
return res;
}
Matrix<M, N> &operator +=(const Matrix<M, N> &m) {
for (unsigned int i = 0; i < N; i++)
for (unsigned int j = 0; j < M; j++)
for (unsigned int j = 0; j < M; j++) {
data[i][j] += m.data[i][j];
}
return *static_cast<Matrix<M, N>*>(this);
}
@ -226,16 +228,18 @@ public:
Matrix<M, N> res;
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
res.data[i][j] = data[i][j] - m.data[i][j];
}
return res;
}
Matrix<M, N> &operator -=(const Matrix<M, N> &m) {
for (unsigned int i = 0; i < N; i++)
for (unsigned int j = 0; j < M; j++)
for (unsigned int j = 0; j < M; j++) {
data[i][j] -= m.data[i][j];
}
return *static_cast<Matrix<M, N>*>(this);
}
@ -247,8 +251,9 @@ public:
Matrix<M, N> res;
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
res.data[i][j] = data[i][j] * num;
}
return res;
@ -256,8 +261,9 @@ public:
Matrix<M, N> &operator *=(const float num) {
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
data[i][j] *= num;
}
return *static_cast<Matrix<M, N>*>(this);
}
@ -266,16 +272,18 @@ public:
Matrix<M, N> res;
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
res[i][j] = data[i][j] / num;
}
return res;
}
Matrix<M, N> &operator /=(const float num) {
for (unsigned int i = 0; i < M; i++)
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
data[i][j] /= num;
}
return *static_cast<Matrix<M, N>*>(this);
}
@ -290,8 +298,10 @@ public:
arm_mat_mult_f32(&arm_mat, &m.arm_mat, &res.arm_mat);
return res;
#else
Eigen::Matrix<float,M,N,Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float,M,N,Eigen::RowMajor> >(this->arm_mat.pData);
Eigen::Matrix<float,N,P,Eigen::RowMajor> Him = Eigen::Map<Eigen::Matrix<float,N,P,Eigen::RowMajor> >(m.arm_mat.pData);
Eigen::Matrix<float, M, N, Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float, M, N, Eigen::RowMajor> >
(this->arm_mat.pData);
Eigen::Matrix<float, N, P, Eigen::RowMajor> Him = Eigen::Map<Eigen::Matrix<float, N, P, Eigen::RowMajor> >
(m.arm_mat.pData);
Eigen::Matrix<float, M, P, Eigen::RowMajor> Product = Me * Him;
Matrix<M, P> res(Product.data());
return res;
@ -307,7 +317,8 @@ public:
arm_mat_trans_f32(&this->arm_mat, &res.arm_mat);
return res;
#else
Eigen::Matrix<float,N,M,Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float,N,M,Eigen::RowMajor> >(this->arm_mat.pData);
Eigen::Matrix<float, N, M, Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float, N, M, Eigen::RowMajor> >
(this->arm_mat.pData);
Me.transposeInPlace();
Matrix<N, M> res(Me.data());
return res;
@ -323,7 +334,8 @@ public:
arm_mat_inverse_f32(&this->arm_mat, &res.arm_mat);
return res;
#else
Eigen::Matrix<float,M,N,Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float,M,N,Eigen::RowMajor> >(this->arm_mat.pData);
Eigen::Matrix<float, M, N, Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float, M, N, Eigen::RowMajor> >
(this->arm_mat.pData);
Eigen::Matrix<float, M, N, Eigen::RowMajor> MyInverse = Me.inverse(); //not sure if A = A.inverse() is a good idea
Matrix<M, N> res(MyInverse.data());
return res;
@ -344,16 +356,18 @@ public:
memset(data, 0, sizeof(data));
unsigned int n = (M < N) ? M : N;
for (unsigned int i = 0; i < n; i++)
for (unsigned int i = 0; i < n; i++) {
data[i][i] = 1;
}
}
void print(void) {
for (unsigned int i = 0; i < M; i++) {
printf("[ ");
for (unsigned int j = 0; j < N; j++)
for (unsigned int j = 0; j < N; j++) {
printf("%.3f\t", data[i][j]);
}
printf(" ]\n");
}
@ -391,7 +405,8 @@ public:
arm_mat_mult_f32(&this->arm_mat, &v.arm_col, &res.arm_col);
#else
//probably nicer if this could go into a function like "eigen_mat_mult" or so
Eigen::Matrix<float,M,N,Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float,M,N,Eigen::RowMajor> >(this->arm_mat.pData);
Eigen::Matrix<float, M, N, Eigen::RowMajor> Me = Eigen::Map<Eigen::Matrix<float, M, N, Eigen::RowMajor> >
(this->arm_mat.pData);
Eigen::VectorXf Vec = Eigen::Map<Eigen::VectorXf>(v.arm_col.pData, N);
Eigen::VectorXf Product = Me * Vec;
Vector<M> res(Product.data());