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

matrix: use infix_iterator for ostream operator

Browse Source
This commit is contained in:
Danny Robson 2016-08-15 17:42:09 +10:00
parent cee2b7b516
commit 18915b6610
1 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
matrix.cpp
View File

@ -16,8 +16,9 @@
#include "matrix.hpp" #include "matrix.hpp"
#include "point.hpp"
#include "debug.hpp" #include "debug.hpp"
#include "iterator.hpp"
#include "point.hpp"
#include <cstring> #include <cstring>
#include <cmath> #include <cmath>
@ -446,33 +447,23 @@ namespace util {
} }
//----------------------------------------------------------------------------- ///////////////////////////////////////////////////////////////////////////////
namespace util { template <size_t S, typename T>
template <size_t S, typename T> std::ostream&
std::ostream& util::operator<< (std::ostream &os, const matrix<S,T> &m)
operator<< (std::ostream &os, const matrix<S,T> &m) {
{ os << "{ ";
os << "{ {" << m.values[0][0] << ", "
<< m.values[0][1] << ", "
<< m.values[0][2] << ", "
<< m.values[0][3] << "}, "
<< "{" << m.values[1][0] << ", "
<< m.values[1][1] << ", "
<< m.values[1][2] << ", "
<< m.values[1][3] << "}, "
<< "{" << m.values[2][0] << ", "
<< m.values[2][1] << ", "
<< m.values[2][2] << ", "
<< m.values[2][3] << "}, "
<< "{" << m.values[3][0] << ", "
<< m.values[3][1] << ", "
<< m.values[3][2] << ", "
<< m.values[3][3] << "} }";
return os; for (size_t i = 0; i < S; ++i) {
os << "{ ";
std::copy (m[i], m[i]+S, util::infix_iterator<float> (os, ", "));
os << ((i == S - 1) ? " }" : " }, ");
} }
return os << " }";
} }
//-----------------------------------------------------------------------------
template std::ostream& util::operator<< (std::ostream&, const matrix<4,float>&); template std::ostream& util::operator<< (std::ostream&, const matrix<4,float>&);
template std::ostream& util::operator<< (std::ostream&, const matrix<4,double>&); template std::ostream& util::operator<< (std::ostream&, const matrix<4,double>&);