X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flinal%2Fmatrix.h;h=83a64f50dd767ff1497804378be48160e8691ed0;hb=03f70f6ba9622bb2840a14fc50ac72201cc533b5;hp=4fc2bc620136a37200629f9d72a3764cbaec2118;hpb=79b2de777a3841bced5fd782a46166fc4d9d7489;p=libs%2Fmath.git

diff --git a/source/linal/matrix.h b/source/linal/matrix.h
index 4fc2bc6..83a64f5 100644
--- a/source/linal/matrix.h
+++ b/source/linal/matrix.h
@@ -1,6 +1,7 @@
 #ifndef MSP_LINAL_MATRIX_H_
 #define MSP_LINAL_MATRIX_H_
 
+#include <algorithm>
 #include "vector.h"
 
 namespace Msp {
@@ -20,30 +21,62 @@ public:
 	Matrix(const T *);
 	template<typename U>
 	Matrix(const Matrix<U, M, N> &);
+
 	static Matrix from_columns(const Vector<T, M> *);
 	static Matrix from_rows(const Vector<T, N> *);
 
-	T &operator()(unsigned, unsigned);
-	const T &operator()(unsigned, unsigned) const;
+	T &element(unsigned i, unsigned j) { return data[i+M*j]; }
+	const T &element(unsigned i, unsigned j) const { return data[i+M*j]; }
+	T &operator()(unsigned i, unsigned j) { return element(i, j); }
+	const T &operator()(unsigned i, unsigned j) const { return element(i, j); }
 
 	Matrix &operator*=(T);
 	Matrix &operator/=(T);
 	Matrix &operator+=(const Matrix &);
 	Matrix &operator-=(const Matrix &);
 
-	Matrix<T, N, M> transpose() const;
+	Matrix &exchange_rows(unsigned, unsigned);
+	Matrix &multiply_row(unsigned, T);
+	Matrix &add_row(unsigned, unsigned, T);
 };
 
 template<typename T, unsigned M, unsigned N>
-inline T &Matrix<T, M, N>::operator()(unsigned i, unsigned j)
+inline Matrix<T, M, N>::Matrix()
+{
+	std::fill(data, data+M*N, T());
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, M, N>::Matrix(const T *d)
 {
-	return data[i+M*j];
+	std::copy(d, d+M*N, data);
 }
 
 template<typename T, unsigned M, unsigned N>
-inline const T &Matrix<T, M, N>::operator()(unsigned i, unsigned j) const
+template<typename U>
+inline Matrix<T, M, N>::Matrix(const Matrix<U, M, N> &other)
 {
-	return data[i+M*j];
+	for(unsigned i=0; i<M; ++i)
+		for(unsigned j=0; j<N; ++j)
+			element(i, j) = other(i, j);
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, M, N> Matrix<T, M, N>::from_columns(const Vector<T, M> *v)
+{
+	Matrix<T, M, N> m;
+	for(unsigned i=0; i<M; ++i)
+		for(unsigned j=0; j<N; ++j)
+			m(i, j) = v[j][i];
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, M, N> Matrix<T, M, N>::from_rows(const Vector<T, N> *v)
+{
+	Matrix<T, M, N> m;
+	for(unsigned i=0; i<M; ++i)
+		for(unsigned j=0; j<N; ++j)
+			m(i, j) = v[i][j];
 }
 
 template<typename T, unsigned M, unsigned N>
@@ -67,6 +100,37 @@ inline Matrix<T, M, N> operator*(T s, const Matrix<T, M, N> &m)
 	return m*s;
 }
 
+template<typename T, unsigned M, unsigned P, unsigned N>
+inline Matrix<T, M, N> operator*(const Matrix<T, M, P> &m1, const Matrix<T, P, N> &m2)
+{
+	Matrix<T, M, N> r;
+	for(unsigned i=0; i<M; ++i)
+		for(unsigned j=0; j<N; ++j)
+			for(unsigned k=0; k<P; ++k)
+				r(i, j) += m1(i, k)*m2(k, j);
+	return r;
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Vector<T, M> operator*(const Matrix<T, M, N> &m, const Vector<T, N> &v)
+{
+	Vector<T, M> r;
+	for(unsigned i=0; i<M; ++i)
+		for(unsigned j=0; j<N; ++j)
+			r[i] += m(i, j)*v[j];
+	return r;
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Vector<T, N> operator*(const Vector<T, M> &v, const Matrix<T, M, N> &m)
+{
+	Vector<T, N> r;
+	for(unsigned j=0; j<N; ++j)
+		for(unsigned i=0; i<M; ++i)
+			r[j] += v[i]*m(i, j);
+	return r;
+}
+
 template<typename T, unsigned M, unsigned N>
 inline Matrix<T, M, N> &Matrix<T, M, N>::operator/=(T s)
 {
@@ -112,34 +176,47 @@ inline Matrix<T, M, N> operator-(const Matrix<T, M, N> &m1, const Matrix<T, M, N
 	return r -= m2;
 }
 
-template<typename T, unsigned M, unsigned P, unsigned N>
-Matrix<T, M, N> operator*(const Matrix<T, M, P> &m1, const Matrix<T, P, N> &m2)
+template<typename T, unsigned M, unsigned N>
+inline bool operator==(const Matrix<T, M, N> &a, const Matrix<T, M, N> &b)
 {
-	Matrix<T, M, N> r;
-	for(unsigned i=0; i<M; ++i)
-		for(unsigned j=0; j<N; ++j)
-			for(unsigned k=0; k<P; ++k)
-				r.at(i, j) += m1(i, k)*m2(k, j);
-	return r;
+	for(unsigned j=0; j<N; ++j)
+		for(unsigned i=0; i<M; ++i)
+			if(a(i, j)!=b(i, j))
+				return false;
+	return true;
 }
 
 template<typename T, unsigned M, unsigned N>
-Vector<T, M> operator*(const Matrix<T, M, N> &m, const Vector<T, N> &v)
+inline Matrix<T, M, N> &Matrix<T, M, N>::exchange_rows(unsigned i, unsigned j)
 {
-	Vector<T, M> r;
-	for(unsigned i=0; i<M; ++i)
-		for(unsigned j=0; j<N; ++j)
-			r[i] += m(i, j)*v[j];
-	return r;
+	for(unsigned k=0; k<N; ++k)
+		std::swap(element(i, k), element(j, k));
+	return *this;
 }
 
 template<typename T, unsigned M, unsigned N>
-Vector<T, N> operator*(const Vector<T, M> &v, const Matrix<T, M, N> &m)
+inline Matrix<T, M, N> &Matrix<T, M, N>::multiply_row(unsigned i, T s)
 {
-	Vector<T, N> r;
+	for(unsigned k=0; k<N; ++k)
+		element(i, k) *= 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)
+{
+	for(unsigned k=0; k<N; ++k)
+		element(j, k) += element(i, k)*s;
+	return *this;
+}
+
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, N, M> transpose(const Matrix<T, M, N> &m)
+{
+	Matrix<T, N, M> r;
 	for(unsigned j=0; j<N; ++j)
 		for(unsigned i=0; i<M; ++i)
-			r[j] += v[i]*m(i, j);
+			r(j, i) = m(i, j);
 	return r;
 }