X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flinal%2Fmatrix.h;h=2ad03447a9b10454f73ab982cf49f26dd25f983f;hb=60caa19c84877c89d750140a90e5d891bce30ee7;hp=2711d40a637489c1bfa3cc9676c2fb8043f978d4;hpb=9ab061034720c1c0db4e8bff5dae4191ccd2a26f;p=libs%2Fmath.git

diff --git a/source/linal/matrix.h b/source/linal/matrix.h
index 2711d40..2ad0344 100644
--- a/source/linal/matrix.h
+++ b/source/linal/matrix.h
@@ -3,6 +3,7 @@
 
 #include <algorithm>
 #include <ostream>
+#include "matrixops.h"
 #include "vector.h"
 
 namespace Msp {
@@ -26,6 +27,7 @@ public:
 	template<typename U>
 	Matrix(const Matrix<U, M, N> &);
 
+	static Matrix identity();
 	static Matrix from_columns(const Vector<T, M> *);
 	static Matrix from_rows(const Vector<T, N> *);
 
@@ -47,13 +49,16 @@ public:
 	Matrix<T, P, Q> block(unsigned, unsigned) const;
 
 	Matrix &operator*=(T);
+	Matrix &operator*=(const Matrix &);
 	Matrix &operator/=(T);
 	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 &invert();
+
+	Matrix &exchange_columns(unsigned, unsigned);
+	Matrix &multiply_column(unsigned, T);
+	Matrix &add_column(unsigned, unsigned, T);
 };
 
 template<typename T, unsigned M, unsigned N>
@@ -77,6 +82,16 @@ inline Matrix<T, M, N>::Matrix(const Matrix<U, M, N> &other)
 			element(i, j) = other(i, j);
 }
 
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, M, N> Matrix<T, M, N>::identity()
+{
+	static_assert(M==N, "An identity matrix must be square");
+	Matrix<T, M, N> m;
+	for(unsigned i=0; i<M; ++i)
+		m(i, i) = T(1);
+	return m;
+}
+
 template<typename T, unsigned M, unsigned N>
 inline Matrix<T, M, N> Matrix<T, M, N>::from_columns(const Vector<T, M> *v)
 {
@@ -127,6 +142,13 @@ inline Matrix<T, M, N> &Matrix<T, M, N>::operator*=(T s)
 	return *this;
 }
 
+template<typename T, unsigned M, unsigned N>
+inline Matrix<T, M, N> &Matrix<T, M, N>::operator*=(const Matrix<T, M, N> &m)
+{
+	static_assert(M==N, "Multiplication-assignment is only possible on square matrices");
+	return *this = *this*m;
+}
+
 template<typename T, unsigned M, unsigned N>
 inline Matrix<T, M, N> operator*(const Matrix<T, M, N> &m, T s)
 {
@@ -216,6 +238,23 @@ 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 N>
+inline Matrix<T, M, N>& Matrix<T, M, N>::invert()
+{
+	static_assert(M==N, "Inversion is only possible on square matrices");
+	Matrix<T, M, N> r = identity();
+	gauss_jordan(*this, r);
+	return *this = r;
+}
+
+template<typename T, unsigned S>
+inline Matrix<T, S, S> invert(const Matrix<T, S, S> &m)
+{
+	Matrix<T, S, S> temp = m;
+	Matrix<T, S, S> r = Matrix<T, S, S>::identity();
+	return gauss_jordan(temp, r);
+}
+
 template<typename T, unsigned M, unsigned N>
 inline bool operator==(const Matrix<T, M, N> &a, const Matrix<T, M, N> &b)
 {
@@ -227,27 +266,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;
 }