Reformat of math library with astyle.

This commit is contained in:
jgoppert
2013-01-06 15:33:55 -05:00
parent 4f3b17f53b
commit d9491b20cc
19 changed files with 1432 additions and 1453 deletions
+210 -230
View File
@@ -56,257 +56,237 @@
namespace math
{
class __EXPORT Matrix {
class __EXPORT Matrix
{
public:
// constructor
Matrix(size_t rows, size_t cols) :
_matrix()
{
arm_mat_init_f32(&_matrix,
rows, cols,
(float*)calloc(rows*cols,sizeof(float)));
}
Matrix(size_t rows, size_t cols, const float * data) :
_matrix()
{
arm_mat_init_f32(&_matrix,
rows, cols,
(float*)malloc(rows*cols*sizeof(float)));
memcpy(getData(),data,getSize());
}
// deconstructor
virtual ~Matrix()
{
delete [] _matrix.pData;
}
// copy constructor (deep)
Matrix(const Matrix & right) :
_matrix()
{
arm_mat_init_f32(&_matrix,
right.getRows(), right.getCols(),
(float*)malloc(right.getRows()*
right.getCols()*sizeof(float)));
memcpy(getData(),right.getData(),
getSize());
}
// assignment
inline Matrix & operator=(const Matrix & right)
{
// constructor
Matrix(size_t rows, size_t cols) :
_matrix() {
arm_mat_init_f32(&_matrix,
rows, cols,
(float *)calloc(rows * cols, sizeof(float)));
}
Matrix(size_t rows, size_t cols, const float *data) :
_matrix() {
arm_mat_init_f32(&_matrix,
rows, cols,
(float *)malloc(rows * cols * sizeof(float)));
memcpy(getData(), data, getSize());
}
// deconstructor
virtual ~Matrix() {
delete [] _matrix.pData;
}
// copy constructor (deep)
Matrix(const Matrix &right) :
_matrix() {
arm_mat_init_f32(&_matrix,
right.getRows(), right.getCols(),
(float *)malloc(right.getRows()*
right.getCols()*sizeof(float)));
memcpy(getData(), right.getData(),
getSize());
}
// assignment
inline Matrix &operator=(const Matrix &right) {
#ifdef MATRIX_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getCols()==right.getCols());
ASSERT(getRows() == right.getRows());
ASSERT(getCols() == right.getCols());
#endif
if (this != &right)
{
memcpy(getData(),right.getData(),
right.getSize());
}
return *this;
}
// element accessors
inline float & operator()(size_t i, size_t j)
{
if (this != &right) {
memcpy(getData(), right.getData(),
right.getSize());
}
return *this;
}
// element accessors
inline float &operator()(size_t i, size_t j) {
#ifdef MATRIX_ASSERT
ASSERT(i<getRows());
ASSERT(j<getCols());
ASSERT(i < getRows());
ASSERT(j < getCols());
#endif
return getData()[i*getCols() + j];
}
inline const float & operator()(size_t i, size_t j) const
{
return getData()[i * getCols() + j];
}
inline const float &operator()(size_t i, size_t j) const {
#ifdef MATRIX_ASSERT
ASSERT(i<getRows());
ASSERT(j<getCols());
ASSERT(i < getRows());
ASSERT(j < getCols());
#endif
return getData()[i*getCols() + j];
}
// output
inline void print() const
{
for (size_t i=0; i<getRows(); i++)
{
for (size_t j=0; j<getCols(); j++)
{
float sig;
int exp;
float num = (*this)(i,j);
float2SigExp(num,sig,exp);
printf ("%6.3fe%03.3d,", (double)sig, exp);
}
printf("\n");
}
}
// boolean ops
inline bool operator==(const Matrix & right) const
{
for (size_t i=0; i<getRows(); i++)
{
for (size_t j=0; j<getCols(); j++)
{
if (fabsf((*this)(i,j)-right(i,j)) > 1e-30f)
return false;
}
}
return true;
}
// scalar ops
inline Matrix operator+(float right) const
{
Matrix result(getRows(), getCols());
arm_offset_f32((float *)getData(),right,
(float *)result.getData(),getRows()*getCols());
return result;
}
inline Matrix operator-(float right) const
{
Matrix result(getRows(), getCols());
arm_offset_f32((float *)getData(),-right,
(float *)result.getData(),getRows()*getCols());
return result;
}
inline Matrix operator*(float right) const
{
Matrix result(getRows(), getCols());
arm_mat_scale_f32(&_matrix,right,
&(result._matrix));
return result;
}
inline Matrix operator/(float right) const
{
Matrix result(getRows(), getCols());
arm_mat_scale_f32(&_matrix,1.0f/right,
&(result._matrix));
return result;
}
// vector ops
inline Vector operator*(const Vector & right) const
{
return getData()[i * getCols() + j];
}
// output
inline void print() const {
for (size_t i = 0; i < getRows(); i++) {
for (size_t j = 0; j < getCols(); j++) {
float sig;
int exp;
float num = (*this)(i, j);
float2SigExp(num, sig, exp);
printf("%6.3fe%03.3d,", (double)sig, exp);
}
printf("\n");
}
}
// boolean ops
inline bool operator==(const Matrix &right) const {
for (size_t i = 0; i < getRows(); i++) {
for (size_t j = 0; j < getCols(); j++) {
if (fabsf((*this)(i, j) - right(i, j)) > 1e-30f)
return false;
}
}
return true;
}
// scalar ops
inline Matrix operator+(float right) const {
Matrix result(getRows(), getCols());
arm_offset_f32((float *)getData(), right,
(float *)result.getData(), getRows()*getCols());
return result;
}
inline Matrix operator-(float right) const {
Matrix result(getRows(), getCols());
arm_offset_f32((float *)getData(), -right,
(float *)result.getData(), getRows()*getCols());
return result;
}
inline Matrix operator*(float right) const {
Matrix result(getRows(), getCols());
arm_mat_scale_f32(&_matrix, right,
&(result._matrix));
return result;
}
inline Matrix operator/(float right) const {
Matrix result(getRows(), getCols());
arm_mat_scale_f32(&_matrix, 1.0f / right,
&(result._matrix));
return result;
}
// vector ops
inline Vector operator*(const Vector &right) const {
#ifdef MATRIX_ASSERT
ASSERT(getCols()==right.getRows());
ASSERT(getCols() == right.getRows());
#endif
Matrix resultMat = (*this)*
Matrix(right.getRows(),1,right.getData());
return Vector(getRows(),resultMat.getData());
}
// matrix ops
inline Matrix operator+(const Matrix & right) const
{
Matrix resultMat = (*this) *
Matrix(right.getRows(), 1, right.getData());
return Vector(getRows(), resultMat.getData());
}
// matrix ops
inline Matrix operator+(const Matrix &right) const {
#ifdef MATRIX_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getCols()==right.getCols());
ASSERT(getRows() == right.getRows());
ASSERT(getCols() == right.getCols());
#endif
Matrix result(getRows(), getCols());
arm_mat_add_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator-(const Matrix & right) const
{
Matrix result(getRows(), getCols());
arm_mat_add_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator-(const Matrix &right) const {
#ifdef MATRIX_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getCols()==right.getCols());
ASSERT(getRows() == right.getRows());
ASSERT(getCols() == right.getCols());
#endif
Matrix result(getRows(), getCols());
arm_mat_sub_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator*(const Matrix & right) const
{
Matrix result(getRows(), getCols());
arm_mat_sub_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator*(const Matrix &right) const {
#ifdef MATRIX_ASSERT
ASSERT(getCols()==right.getRows());
ASSERT(getCols() == right.getRows());
#endif
Matrix result(getRows(), right.getCols());
arm_mat_mult_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator/(const Matrix & right) const
{
Matrix result(getRows(), right.getCols());
arm_mat_mult_f32(&_matrix, &(right._matrix),
&(result._matrix));
return result;
}
inline Matrix operator/(const Matrix &right) const {
#ifdef MATRIX_ASSERT
ASSERT(right.getRows()==right.getCols());
ASSERT(getCols()==right.getCols());
ASSERT(right.getRows() == right.getCols());
ASSERT(getCols() == right.getCols());
#endif
return (*this)*right.inverse();
}
// other functions
inline Matrix transpose() const
{
Matrix result(getCols(),getRows());
arm_mat_trans_f32(&_matrix, &(result._matrix));
return result;
}
inline void swapRows(size_t a, size_t b)
{
if (a==b) return;
for(size_t j=0;j<getCols();j++) {
float tmp = (*this)(a,j);
(*this)(a,j) = (*this)(b,j);
(*this)(b,j) = tmp;
}
}
inline void swapCols(size_t a, size_t b)
{
if (a==b) return;
for(size_t i=0;i<getRows();i++) {
float tmp = (*this)(i,a);
(*this)(i,a) = (*this)(i,b);
(*this)(i,b) = tmp;
}
}
/**
* inverse based on LU factorization with partial pivotting
*/
Matrix inverse() const
{
return (*this) * right.inverse();
}
// other functions
inline Matrix transpose() const {
Matrix result(getCols(), getRows());
arm_mat_trans_f32(&_matrix, &(result._matrix));
return result;
}
inline void swapRows(size_t a, size_t b) {
if (a == b) return;
for (size_t j = 0; j < getCols(); j++) {
float tmp = (*this)(a, j);
(*this)(a, j) = (*this)(b, j);
(*this)(b, j) = tmp;
}
}
inline void swapCols(size_t a, size_t b) {
if (a == b) return;
for (size_t i = 0; i < getRows(); i++) {
float tmp = (*this)(i, a);
(*this)(i, a) = (*this)(i, b);
(*this)(i, b) = tmp;
}
}
/**
* inverse based on LU factorization with partial pivotting
*/
Matrix inverse() const {
#ifdef MATRIX_ASSERT
ASSERT(getRows()==getCols());
ASSERT(getRows() == getCols());
#endif
Matrix result(getRows(), getCols());
Matrix work = (*this);
arm_mat_inverse_f32(&(work._matrix),
&(result._matrix));
return result;
}
inline void setAll(const float & val)
{
for (size_t i=0;i<getRows();i++) {
for (size_t j=0;j<getCols();j++) {
(*this)(i,j) = val;
}
}
}
inline void set(const float * data)
{
memcpy(getData(),data,getSize());
}
inline size_t getRows() const { return _matrix.numRows; }
inline size_t getCols() const { return _matrix.numCols; }
inline static Matrix identity(size_t size) {
Matrix result(size,size);
for (size_t i=0; i<size; i++) {
result(i,i) = 1.0f;
}
return result;
}
inline static Matrix zero(size_t size) {
Matrix result(size,size);
result.setAll(0.0f);
return result;
}
inline static Matrix zero(size_t m, size_t n) {
Matrix result(m,n);
result.setAll(0.0f);
return result;
}
Matrix result(getRows(), getCols());
Matrix work = (*this);
arm_mat_inverse_f32(&(work._matrix),
&(result._matrix));
return result;
}
inline void setAll(const float &val) {
for (size_t i = 0; i < getRows(); i++) {
for (size_t j = 0; j < getCols(); j++) {
(*this)(i, j) = val;
}
}
}
inline void set(const float *data) {
memcpy(getData(), data, getSize());
}
inline size_t getRows() const { return _matrix.numRows; }
inline size_t getCols() const { return _matrix.numCols; }
inline static Matrix identity(size_t size) {
Matrix result(size, size);
for (size_t i = 0; i < size; i++) {
result(i, i) = 1.0f;
}
return result;
}
inline static Matrix zero(size_t size) {
Matrix result(size, size);
result.setAll(0.0f);
return result;
}
inline static Matrix zero(size_t m, size_t n) {
Matrix result(m, n);
result.setAll(0.0f);
return result;
}
protected:
inline size_t getSize() const { return sizeof(float)*getRows()*getCols(); }
inline float * getData() { return _matrix.pData; }
inline const float * getData() const { return _matrix.pData; }
inline void setData(float * data) { _matrix.pData = data; }
inline size_t getSize() const { return sizeof(float) * getRows() * getCols(); }
inline float *getData() { return _matrix.pData; }
inline const float *getData() const { return _matrix.pData; }
inline void setData(float *data) { _matrix.pData = data; }
private:
arm_matrix_instance_f32 _matrix;
arm_matrix_instance_f32 _matrix;
};
} // namespace math
+147 -167
View File
@@ -55,186 +55,166 @@
namespace math
{
class __EXPORT Vector {
class __EXPORT Vector
{
public:
// constructor
Vector(size_t rows) :
_rows(rows),
_data((float*)calloc(rows,sizeof(float)))
{
}
Vector(size_t rows, const float * data) :
_rows(rows),
_data((float*)malloc(getSize()))
{
memcpy(getData(),data,getSize());
}
// deconstructor
virtual ~Vector()
{
delete [] getData();
}
// copy constructor (deep)
Vector(const Vector & right) :
_rows(right.getRows()),
_data((float*)malloc(getSize()))
{
memcpy(getData(),right.getData(),
right.getSize());
}
// assignment
inline Vector & operator=(const Vector & right)
{
// constructor
Vector(size_t rows) :
_rows(rows),
_data((float *)calloc(rows, sizeof(float))) {
}
Vector(size_t rows, const float *data) :
_rows(rows),
_data((float *)malloc(getSize())) {
memcpy(getData(), data, getSize());
}
// deconstructor
virtual ~Vector() {
delete [] getData();
}
// copy constructor (deep)
Vector(const Vector &right) :
_rows(right.getRows()),
_data((float *)malloc(getSize())) {
memcpy(getData(), right.getData(),
right.getSize());
}
// assignment
inline Vector &operator=(const Vector &right) {
#ifdef VECTOR_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getRows() == right.getRows());
#endif
if (this != &right)
{
memcpy(getData(),right.getData(),
right.getSize());
}
return *this;
}
// element accessors
inline float& operator()(size_t i)
{
if (this != &right) {
memcpy(getData(), right.getData(),
right.getSize());
}
return *this;
}
// element accessors
inline float &operator()(size_t i) {
#ifdef VECTOR_ASSERT
ASSERT(i<getRows());
ASSERT(i < getRows());
#endif
return getData()[i];
}
inline const float& operator()(size_t i) const
{
return getData()[i];
}
inline const float &operator()(size_t i) const {
#ifdef VECTOR_ASSERT
ASSERT(i<getRows());
ASSERT(i < getRows());
#endif
return getData()[i];
}
// output
inline void print() const
{
for (size_t i=0; i<getRows(); i++)
{
float sig;
int exp;
float num = (*this)(i);
float2SigExp(num,sig,exp);
printf ("%6.3fe%03.3d,", (double)sig, exp);
}
printf("\n");
}
// boolean ops
inline bool operator==(const Vector & right) const
{
for (size_t i=0; i<getRows(); i++)
{
if (fabsf(((*this)(i) - right(i))) > 1e-30f)
return false;
}
return true;
}
// scalar ops
inline Vector operator+(float right) const
{
Vector result(getRows());
arm_offset_f32((float*)getData(),
right, result.getData(),
getRows());
return result;
}
inline Vector operator-(float right) const
{
Vector result(getRows());
arm_offset_f32((float*)getData(),
-right, result.getData(),
getRows());
return result;
}
inline Vector operator*(float right) const
{
Vector result(getRows());
arm_scale_f32((float*)getData(),
right, result.getData(),
getRows());
return result;
}
inline Vector operator/(float right) const
{
Vector result(getRows());
arm_scale_f32((float*)getData(),
1.0f/right, result.getData(),
getRows());
return result;
}
// vector ops
inline Vector operator+(const Vector & right) const
{
return getData()[i];
}
// output
inline void print() const {
for (size_t i = 0; i < getRows(); i++) {
float sig;
int exp;
float num = (*this)(i);
float2SigExp(num, sig, exp);
printf("%6.3fe%03.3d,", (double)sig, exp);
}
printf("\n");
}
// boolean ops
inline bool operator==(const Vector &right) const {
for (size_t i = 0; i < getRows(); i++) {
if (fabsf(((*this)(i) - right(i))) > 1e-30f)
return false;
}
return true;
}
// scalar ops
inline Vector operator+(float right) const {
Vector result(getRows());
arm_offset_f32((float *)getData(),
right, result.getData(),
getRows());
return result;
}
inline Vector operator-(float right) const {
Vector result(getRows());
arm_offset_f32((float *)getData(),
-right, result.getData(),
getRows());
return result;
}
inline Vector operator*(float right) const {
Vector result(getRows());
arm_scale_f32((float *)getData(),
right, result.getData(),
getRows());
return result;
}
inline Vector operator/(float right) const {
Vector result(getRows());
arm_scale_f32((float *)getData(),
1.0f / right, result.getData(),
getRows());
return result;
}
// vector ops
inline Vector operator+(const Vector &right) const {
#ifdef VECTOR_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getRows() == right.getRows());
#endif
Vector result(getRows());
arm_add_f32((float*)getData(),
(float*)right.getData(),
result.getData(),
getRows());
return result;
}
inline Vector operator-(const Vector & right) const
{
Vector result(getRows());
arm_add_f32((float *)getData(),
(float *)right.getData(),
result.getData(),
getRows());
return result;
}
inline Vector operator-(const Vector &right) const {
#ifdef VECTOR_ASSERT
ASSERT(getRows()==right.getRows());
ASSERT(getRows() == right.getRows());
#endif
Vector result(getRows());
arm_sub_f32((float*)getData(),
(float*)right.getData(),
result.getData(),
getRows());
return result;
}
// other functions
inline float dot(const Vector & right)
{
float result = 0;
arm_dot_prod_f32((float*)getData(),
(float*)right.getData(),
getRows(),
&result);
return result;
}
inline float norm()
{
return sqrtf(dot(*this));
}
inline Vector unit()
{
return (*this)/norm();
}
inline static Vector zero(size_t rows)
{
Vector result(rows);
// calloc returns zeroed memory
return result;
}
inline void setAll(const float & val)
{
for (size_t i=0;i<getRows();i++)
{
(*this)(i) = val;
}
}
inline void set(const float * data)
{
memcpy(getData(),data,getSize());
}
inline size_t getRows() const { return _rows; }
inline const float * getData() const { return _data; }
Vector result(getRows());
arm_sub_f32((float *)getData(),
(float *)right.getData(),
result.getData(),
getRows());
return result;
}
// other functions
inline float dot(const Vector &right) {
float result = 0;
arm_dot_prod_f32((float *)getData(),
(float *)right.getData(),
getRows(),
&result);
return result;
}
inline float norm() {
return sqrtf(dot(*this));
}
inline Vector unit() {
return (*this) / norm();
}
inline static Vector zero(size_t rows) {
Vector result(rows);
// calloc returns zeroed memory
return result;
}
inline void setAll(const float &val) {
for (size_t i = 0; i < getRows(); i++) {
(*this)(i) = val;
}
}
inline void set(const float *data) {
memcpy(getData(), data, getSize());
}
inline size_t getRows() const { return _rows; }
inline const float *getData() const { return _data; }
protected:
inline size_t getSize() const { return sizeof(float)*getRows(); }
inline float * getData() { return _data; }
inline void setData(float * data) { _data = data; }
inline size_t getSize() const { return sizeof(float) * getRows(); }
inline float *getData() { return _data; }
inline void setData(float *data) { _data = data; }
private:
size_t _rows;
float * _data;
size_t _rows;
float *_data;
};
} // math