X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flinal%2Fmatrix.h;h=bf21184092046c71bc1973ae1575deff51406fb7;hb=ff8619c1c440fd1a7c8deaca763a33b8e1d53b5e;hp=1c831be6b11cf6f4181366017c739c9ba5e4fd30;hpb=7d43d93ac2d701bb3de87cdf81e44c03e64c35c3;p=libs%2Fmath.git

diff --git a/source/linal/matrix.h b/source/linal/matrix.h
index 1c831be..bf21184 100644
--- a/source/linal/matrix.h
+++ b/source/linal/matrix.h
@@ -2,6 +2,7 @@
 #define MSP_LINAL_MATRIX_H_
 
 #include <algorithm>
+#include <ostream>
 #include "vector.h"
 
 namespace Msp {
@@ -36,6 +37,9 @@ public:
 	T &operator()(unsigned i, unsigned j) { return element(i, j); }
 	const T &operator()(unsigned i, unsigned j) const { return element(i, j); }
 
+	Vector<T, M> column(unsigned i) const { return Vector<T, M>(data+M*i); }
+	Vector<T, N> row(unsigned i) const { return Vector<T, N>(data+i, M); }
+
 	template<unsigned P, unsigned Q>
 	Matrix<T, P, Q> select(const Vector<unsigned, P> &, const Vector<unsigned, Q> &) const;
 
@@ -47,9 +51,9 @@ public:
 	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>
@@ -223,27 +227,27 @@ inline bool operator==(const Matrix<T, M, N> &a, const Matrix<T, M, N> &b)
 }
 
 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;
 }
 
@@ -257,6 +261,27 @@ inline Matrix<T, N, M> transpose(const Matrix<T, M, N> &m)
 	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