eryn/charles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Zero() and Identity() definitions to the right place

Browse source
This commit is contained in:
Eryn Wells 2014-08-08 22:13:51 -07:00
parent 2cadffd7d4
commit 9474153736
1 changed files with 30 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

64
src/basics/matrix.hh
View file

@ -70,6 +70,36 @@ template<UInt N, UInt M>
Matrix<N,M> operator*(const Double& lhs, const Matrix<N,M>& rhs); Matrix<N,M> operator*(const Double& lhs, const Matrix<N,M>& rhs);
/*
* charles::basics::Matrix<>::Zero --
*/
template<UInt N, UInt M>
/* static */ Matrix<N,M>
Matrix<N,M>::Zero()
{
Matrix<N,M> m;
bzero(m.mData, sizeof(Double) * N * M);
return m;
}
/*
* charles::basics::Matrix<>::Identity --
*/
template<UInt N, UInt M>
/* static */ Matrix<N,M>
Matrix<N,M>::Identity()
{
static_assert(N == M, "Identity matrices must be square.");
auto m = Matrix<N,M>::Zero();
for (size_t i = 0; i < N; i++) {
m(i,i) = 1.0;
}
return m;
}
/* /*
* charles::basics::Matrix<>::Matrix -- * charles::basics::Matrix<>::Matrix --
*/ */
@ -140,40 +170,6 @@ Matrix<N,M>::operator!=(const Matrix<N,M>& rhs)
} }
/*
* charles::basics::Matrix<>::Zero --
*/
template<UInt N, UInt M>
Matrix<N,M>
Matrix<N,M>::Zero()
{
Matrix<N,M> m;
bzero(m.mData, sizeof(Double) * N * M);
return m;
}
/*
* charles::basics::Matrix<>::Identity --
*/
template<UInt N, UInt M>
Matrix<N,M>
Matrix<N,M>::Identity()
{
static_assert(N == M, "Identity matrices must be square.");
auto m = Matrix<N,M>::Zero();
for (int i = 0; i < N; i++) {
for (int j = 0; j < M; j++) {
if (i == j) {
m(i,j) = 1.0;
}
}
}
return m;
}
/* /*
* charles::basics::Matrix<>::operator() -- * charles::basics::Matrix<>::operator() --
*/ */