Danny Robson
d3f434b523
The coordinate system was unable to support types that prohibited redim or retype operations. Additionally, the `tags' type used for providing named data parameters was unwiedly. We remove much of the dependance on template template parameters in the defined operations and instead define these in terms of a template specialisation of is_coord. The tag types were replaced with direct specialisation of the `store' struct by the primary type, and passing this type through use of the CRTP.
273 lines
9.3 KiB
C++
273 lines
9.3 KiB
C++
/*
|
|
* 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];
|
|
//}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
T*
|
|
util::matrix<Rows,Cols,T>::data (void)
|
|
{
|
|
return begin ();
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
const T*
|
|
util::matrix<Rows,Cols,T>::data (void) const
|
|
{
|
|
return begin ();
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
const T*
|
|
util::matrix<Rows,Cols,T>::begin (void) const
|
|
{
|
|
return &(*this)[0][0];
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
const T*
|
|
util::matrix<Rows,Cols,T>::end (void) const
|
|
{
|
|
return &(*this)[Rows][0];
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
const T*
|
|
util::matrix<Rows,Cols,T>::cbegin (void) const
|
|
{
|
|
return begin ();
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
const T*
|
|
util::matrix<Rows,Cols,T>::cend (void) const
|
|
{
|
|
return end ();
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
T*
|
|
util::matrix<Rows,Cols,T>::begin (void)
|
|
{
|
|
return &(*this)[0][0];
|
|
}
|
|
|
|
|
|
//-----------------------------------------------------------------------------
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
T*
|
|
util::matrix<Rows,Cols,T>::end (void)
|
|
{
|
|
return &(*this)[Rows][0];
|
|
}
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
template <std::size_t Rows, std::size_t Cols, typename T>
|
|
template <typename U>
|
|
util::matrix<Rows,Cols,U>
|
|
util::matrix<Rows,Cols,T>::cast (void) const
|
|
{
|
|
util::matrix<Rows,Cols,T> out;
|
|
std::copy (cbegin (), cend (), std::begin (out));
|
|
return out;
|
|
}
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
#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));
|
|
}
|