Make gauss_jordan operate on columns instead of rows

[libs/math.git] / source / linal / matrix.h

diff --git a/source/linal/matrix.h b/source/linal/matrix.h
index 2711d40a637489c1bfa3cc9676c2fb8043f978d4..bf21184092046c71bc1973ae1575deff51406fb7 100644 (file)
--- a/source/linal/matrix.h
+++ b/source/linal/matrix.h
@@ -51,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>
@@ -227,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;
 }