#define MSP_LINAL_MATRIX_H_
#include <algorithm>
+#include <ostream>
#include "vector.h"
namespace Msp {
Matrix &operator+=(const Matrix &);
Matrix &operator-=(const Matrix &);
- Matrix &exchange_rows(unsigned, unsigned);
- Matrix &multiply_row(unsigned, T);
- Matrix &add_row(unsigned, unsigned, T);
+ Matrix &exchange_columns(unsigned, unsigned);
+ Matrix &multiply_column(unsigned, T);
+ Matrix &add_column(unsigned, unsigned, T);
};
template<typename T, unsigned M, unsigned N>
}
template<typename T, unsigned M, unsigned N>
-inline Matrix<T, M, N> &Matrix<T, M, N>::exchange_rows(unsigned i, unsigned j)
+inline Matrix<T, M, N> &Matrix<T, M, N>::exchange_columns(unsigned i, unsigned j)
{
using std::swap;
- for(unsigned k=0; k<N; ++k)
- swap(element(i, k), element(j, k));
+ for(unsigned k=0; k<M; ++k)
+ swap(element(k, i), element(k, j));
return *this;
}
template<typename T, unsigned M, unsigned N>
-inline Matrix<T, M, N> &Matrix<T, M, N>::multiply_row(unsigned i, T s)
+inline Matrix<T, M, N> &Matrix<T, M, N>::multiply_column(unsigned i, T s)
{
- for(unsigned k=0; k<N; ++k)
- element(i, k) *= s;
+ for(unsigned k=0; k<M; ++k)
+ element(k, i) *= s;
return *this;
}
template<typename T, unsigned M, unsigned N>
-inline Matrix<T, M, N> &Matrix<T, M, N>::add_row(unsigned i, unsigned j, T s)
+inline Matrix<T, M, N> &Matrix<T, M, N>::add_column(unsigned i, unsigned j, T s)
{
- for(unsigned k=0; k<N; ++k)
- element(j, k) += element(i, k)*s;
+ for(unsigned k=0; k<M; ++k)
+ element(k, j) += element(k, i)*s;
return *this;
}
return r;
}
+template<typename T, unsigned M, unsigned N>
+inline std::ostream &operator<<(std::ostream &s, const Matrix<T, M, N> &m)
+{
+ s << "Matrix" << M << 'x' << N << '(';
+ for(unsigned i=0; i<N; ++i)
+ {
+ if(i)
+ s << ", ";
+ s << '[';
+ for(unsigned j=0; j<M; ++j)
+ {
+ if(j)
+ s << ", ";
+ s << m(j, i);
+ }
+ s << ']';
+ }
+ s << ')';
+ return s;
+}
+
} // namespace LinAl
} // namespace Msp