nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

matrix: move implementation from ipp to hpp

Browse Source
This commit is contained in:
Danny Robson 2017-11-24 12:24:44 +11:00
parent 0351313c36
commit 59240ce83a
4 changed files with 145 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -329,7 +329,6 @@ list (
matrix3.cpp matrix3.cpp
matrix4.cpp matrix4.cpp
matrix.hpp matrix.hpp
matrix.ipp
memory/deleter.cpp memory/deleter.cpp
memory/deleter.hpp memory/deleter.hpp
nocopy.hpp nocopy.hpp

163
matrix.hpp
View File

@ -25,7 +25,11 @@
#include <cstdlib> #include <cstdlib>
namespace util { namespace util {
template <std::size_t Rows, std::size_t Cols, typename T> template <
std::size_t Rows,
std::size_t Cols,
typename T
>
struct matrix { struct matrix {
static constexpr auto rows = Rows; static constexpr auto rows = Rows;
static constexpr auto cols = Cols; static constexpr auto cols = Cols;
@ -49,7 +53,7 @@ namespace util {
values[r][c] = _data[r][c]; values[r][c] = _data[r][c];
} }
T values[rows][cols]; T values[Rows][Cols];
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////
// index operators return a pointer into the data array so that // index operators return a pointer into the data array so that
@ -60,56 +64,56 @@ namespace util {
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
data (void) noexcept data (void)& noexcept
{ {
return begin (); return begin ();
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
data (void) const noexcept data (void) const& noexcept
{ {
return begin (); return begin ();
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
begin (void) const noexcept begin (void) const& noexcept
{ {
return &(*this)[0][0]; return &(*this)[0][0];
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
end (void) const noexcept end (void) const& noexcept
{ {
return &(*this)[Rows][0]; return &(*this)[Rows][0];
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
begin (void) noexcept begin (void)& noexcept
{ {
return &(*this)[0][0]; return &(*this)[0][0];
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
end (void) noexcept end (void)& noexcept
{ {
return &(*this)[Rows][0]; return &(*this)[Rows][0];
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
cbegin (void) const noexcept cbegin (void) const& noexcept
{ {
return begin (); return begin ();
} }
//--------------------------------------------------------------------- //---------------------------------------------------------------------
constexpr auto constexpr auto
cend (void) const noexcept cend (void) const& noexcept
{ {
return end (); return end ();
} }
@ -146,14 +150,28 @@ namespace util {
matrix<Rows,Cols,U> matrix<Rows,Cols,U>
cast (void) const noexcept cast (void) const noexcept
{ {
util::matrix<Rows,Cols,T> out; matrix out;
std::copy (cbegin (), cend (), std::begin (out)); std::copy (cbegin (), cend (), std::begin (out));
return out; return out;
} }
// Constant matrices // Constant matrices
static constexpr matrix identity (); static constexpr
static constexpr matrix zeroes (); matrix identity (void) noexcept
{
auto m = zeroes ();
for (std::size_t i = 0; i < Rows; ++i)
m[i][i] = 1;
return m;
}
static constexpr
matrix zeroes (void) noexcept
{
matrix ret {};
std::fill (std::begin (ret), std::end (ret), T{0});
return ret;
}
}; };
@ -164,10 +182,10 @@ namespace util {
template <typename T> matrix<4,4,T> look_at (point<3,T> eye, point<3,T> target, vector<3,T> up); template <typename T> matrix<4,4,T> look_at (point<3,T> eye, point<3,T> target, vector<3,T> up);
// Affine matrices // Affine matrices
template <typename T> matrix<4,4,T> translation (util::vector<3,T>); template <typename T> matrix<4,4,T> translation (vector<3,T>);
template <typename T> matrix<4,4,T> scale (util::vector<3,T>); template <typename T> matrix<4,4,T> scale (vector<3,T>);
template <typename T> matrix<4,4,T> scale (T); template <typename T> matrix<4,4,T> scale (T);
template <typename T> matrix<4,4,T> rotation (T angle, util::vector<3,T> about); template <typename T> matrix<4,4,T> rotation (T angle, vector<3,T> about);
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -185,13 +203,20 @@ namespace util {
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
constexpr constexpr
bool bool
operator== (const matrix<Rows,Cols,T>&, const matrix<Rows,Cols,T>&); operator== (const matrix<Rows,Cols,T> &a, const matrix<Rows,Cols,T> &b)
{
return std::equal (std::cbegin (a), std::cend (a), std::cbegin (b));
}
//-------------------------------------------------------------------------
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
constexpr constexpr
bool bool
operator!= (const matrix<Rows,Cols,T>&, const matrix<Rows,Cols,T>&); operator!= (const matrix<Rows,Cols,T> &a, const matrix<Rows,Cols,T> &b)
{
return !(a == b);
}
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -302,24 +327,112 @@ namespace util {
T T
determinant (const matrix<Rows,Cols,T>&); determinant (const matrix<Rows,Cols,T>&);
//-------------------------------------------------------------------------
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
matrix<Rows,Cols,T> matrix<Rows,Cols,T>
inverse (const matrix<Rows,Cols,T>&); inverse (const matrix<Rows,Cols,T>&);
//-------------------------------------------------------------------------
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
matrix<Cols,Rows,T> matrix<Cols,Rows,T>
transposed (const matrix<Rows,Cols,T>&); transposed (const matrix<Rows,Cols,T>&);
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
matrix<Rows,Cols,T> matrix<Rows,Cols,T>
abs (const matrix<Rows,Cols,T>&); abs (const matrix<Rows,Cols,T> &src)
{
matrix<Rows,Cols,T> dst;
std::transform (std::cbegin (src), std::cend (src), std::begin (dst), util::abs<T>);
return dst;
}
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
constexpr constexpr T
T sum (const matrix<Rows,Cols,T> &src)
sum (const matrix<Rows,Cols,T>&); {
return sum (std::cbegin (src), std::cend (src));
}
///////////////////////////////////////////////////////////////////////////
#define MATRIX_ELEMENT_OP(OP) \
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
matrix<Rows,Cols,T> \
operator OP ( \
const matrix<Rows,Cols,T> &a, \
const matrix<Rows,Cols,T> &b) \
{ \
matrix<Rows,Cols,T> res {}; \
\
for (std::size_t i = 0; i < a.rows; ++i) \
for (std::size_t j = 0; j < a.cols; ++j) \
res[i][j] = a[i][j] OP b[i][j]; \
\
return res; \
}
MATRIX_ELEMENT_OP(-)
MATRIX_ELEMENT_OP(+)
#undef MATRIX_ELEMENT_OP
///////////////////////////////////////////////////////////////////////////
#define MATRIX_SCALAR_OP(OP) \
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
matrix<Rows,Cols,T> \
operator OP (const matrix<Rows,Cols,T> &m, const T t) \
{ \
matrix<Rows,Cols,T> res {}; \
\
std::transform ( \
std::cbegin (m), \
std::cend (m), \
std::begin (res), \
[&t] (auto x) { return x OP t; } \
); \
\
return res; \
} \
\
\
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
matrix<Rows,Cols,T> \
operator OP (const T t, const matrix<Rows,Cols,T> &m) \
{ \
return m OP t; \
} \
\
\
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
matrix<Rows,Cols,T>& \
operator OP##= (matrix<Rows,Cols,T> &m, T t) \
{ \
std::transform ( \
std::cbegin (m), \
std::cend (m), \
std::begin (m), \
[&t] (auto x) { return x OP t; } \
); \
\
return m; \
}
MATRIX_SCALAR_OP(*)
MATRIX_SCALAR_OP(/)
MATRIX_SCALAR_OP(+)
MATRIX_SCALAR_OP(-)
#undef MATRIX_SCALAR_OP
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -342,8 +455,8 @@ namespace util {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T> template <std::size_t Rows, std::size_t Cols, typename T>
std::ostream& operator<< (std::ostream&, const matrix<Rows,Cols,T>&); std::ostream& operator<< (std::ostream&, const matrix<Rows,Cols,T>&);
} }
#include "matrix.ipp"
#endif #endif

188
matrix.ipp
View File

@ -1,188 +0,0 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Copyright 2011-2015 Danny Robson <danny@nerdcruft.net>
*/
#ifdef __UTIL_MATRIX_IPP
#error
#endif
#include "matrix.hpp"
#define __UTIL_MATRIX_IPP
///////////////////////////////////////////////////////////////////////////////
//template <std::size_t Rows, std::size_t Cols, typename T>
//T*
//util::matrix<Rows,Cols,T>::operator[] (int idx)
//{
// return this->values[idx];
//}
//
//
////-----------------------------------------------------------------------------
//template <std::size_t Rows, std::size_t Cols, typename T>
//const T*
//util::matrix<Rows,Cols,T>::operator[] (int idx) const
//{
// return this->values[idx];
//}
///////////////////////////////////////////////////////////////////////////////
#define MATRIX_ELEMENT_OP(OP) \
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
util::matrix<Rows,Cols,T> \
util::operator OP ( \
const util::matrix<Rows,Cols,T> &a, \
const util::matrix<Rows,Cols,T> &b) \
{ \
util::matrix<Rows,Cols,T> res {}; \
\
for (std::size_t i = 0; i < a.rows; ++i) \
for (std::size_t j = 0; j < a.cols; ++j) \
res[i][j] = a[i][j] OP b[i][j]; \
\
return res; \
}
MATRIX_ELEMENT_OP(-)
MATRIX_ELEMENT_OP(+)
#undef MATRIX_ELEMENT_OP
///////////////////////////////////////////////////////////////////////////////
#define MATRIX_SCALAR_OP(OP) \
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
util::matrix<Rows,Cols,T> \
util::operator OP (const util::matrix<Rows,Cols,T> &m, const T t) \
{ \
util::matrix<Rows,Cols,T> res {}; \
\
std::transform ( \
std::cbegin (m), \
std::cend (m), \
std::begin (res), \
[&t] (auto x) { return x OP t; } \
); \
\
return res; \
} \
\
\
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
util::matrix<Rows,Cols,T> \
util::operator OP (const T t, const util::matrix<Rows,Cols,T> &m) \
{ \
return m OP t; \
} \
\
\
template <std::size_t Rows, std::size_t Cols, typename T> \
constexpr \
util::matrix<Rows,Cols,T>& \
util::operator OP##= (util::matrix<Rows,Cols,T> &m, T t) \
{ \
std::transform ( \
std::cbegin (m), \
std::cend (m), \
std::begin (m), \
[&t] (auto x) { return x OP t; } \
); \
\
return m; \
}
MATRIX_SCALAR_OP(*)
MATRIX_SCALAR_OP(/)
MATRIX_SCALAR_OP(+)
MATRIX_SCALAR_OP(-)
#undef MATRIX_SCALAR_OP
///////////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T>
constexpr
util::matrix<Rows,Cols,T>
util::matrix<Rows,Cols,T>::zeroes (void)
{
util::matrix<Rows,Cols,T> ret {};
for (std::size_t r = 0; r < Rows; ++r)
for (std::size_t c = 0; c < Cols; ++c)
ret[r][c] = 0;
return ret;
}
///////////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T>
constexpr
util::matrix<Rows,Cols,T>
util::matrix<Rows,Cols,T>::identity (void)
{
static_assert (Rows == Cols);
auto m = zeroes ();
for (std::size_t i = 0; i < Rows; ++i)
m[i][i] = 1;
return m;
}
///////////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T>
constexpr
bool
util::operator== (const matrix<Rows,Cols,T> &a, const matrix<Rows,Cols,T> &b)
{
return std::equal (std::cbegin (a), std::cend (a), std::cbegin (b));
}
//-----------------------------------------------------------------------------
template <std::size_t Rows, std::size_t Cols, typename T>
constexpr
bool
util::operator!= (const matrix<Rows,Cols,T> &a, const matrix<Rows,Cols,T> &b)
{
return !(a == b);
}
///////////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T>
util::matrix<Rows,Cols,T>
util::abs (const util::matrix<Rows,Cols,T> &src)
{
util::matrix<Rows,Cols,T> dst;
std::transform (std::cbegin (src), std::cend (src), std::begin (dst), util::abs<T>);
return dst;
}
///////////////////////////////////////////////////////////////////////////////
template <std::size_t Rows, std::size_t Cols, typename T>
constexpr
T
util::sum (const util::matrix<Rows, Cols,T> &src)
{
return sum (std::cbegin (src), std::cend (src));
}

7
test/matrix.cpp
View File

@ -15,6 +15,13 @@ main (void)
{ {
util::TAP::logger tap; util::TAP::logger tap;
// a quick check to make sure this function is actually provided
tap.expect_eq (sum (util::matrix4f::zeroes ()), 0.f, "zero matrix sums to zero");
// trivial check for matrix summation. useful to sanity test some
// alignment constraints if run under a tool like memorysanitizer or
// valgrind.
static constexpr util::matrix4f SEQ { { static constexpr util::matrix4f SEQ { {
{ 1, 2, 3, 4 }, { 1, 2, 3, 4 },
{ 5, 6, 7, 8 }, { 5, 6, 7, 8 },