X-Git-Url: http://git.tdb.fi/?p=libs%2Fmath.git;a=blobdiff_plain;f=source%2Flinal%2Fdynamicmatrix.h;fp=source%2Flinal%2Fdynamicmatrix.h;h=de4511c647e870eaf97376127c3195b8ccabe979;hp=1b191a1b3f9a5d4696c4d535e94553e6b96f93e6;hb=ff8619c1c440fd1a7c8deaca763a33b8e1d53b5e;hpb=291c11cf66e7083dc21fffea1afbdeaaad96077d

diff --git a/source/linal/dynamicmatrix.h b/source/linal/dynamicmatrix.h
index 1b191a1..de4511c 100644
--- a/source/linal/dynamicmatrix.h
+++ b/source/linal/dynamicmatrix.h
@@ -45,9 +45,9 @@ public:
 	DynamicMatrix &operator+=(const DynamicMatrix &);
 	DynamicMatrix &operator-=(const DynamicMatrix &);
 
-	DynamicMatrix &exchange_rows(unsigned, unsigned);
-	DynamicMatrix &multiply_row(unsigned, T);
-	DynamicMatrix &add_row(unsigned, unsigned, T);
+	DynamicMatrix &exchange_columns(unsigned, unsigned);
+	DynamicMatrix &multiply_column(unsigned, T);
+	DynamicMatrix &add_column(unsigned, unsigned, T);
 
 	DynamicMatrix &invert();
 };
@@ -252,38 +252,38 @@ inline bool operator==(const DynamicMatrix<T> &m1, const DynamicMatrix<T> &m2)
 }
 
 template<typename T>
-inline DynamicMatrix<T> &DynamicMatrix<T>::exchange_rows(unsigned i, unsigned j)
+inline DynamicMatrix<T> &DynamicMatrix<T>::exchange_columns(unsigned i, unsigned j)
 {
-	if(i>=rows_ || j>=rows_)
-		throw std::out_of_range("DynamicMatrix::exchange_rows");
+	if(i>=columns_ || j>=columns_)
+		throw std::out_of_range("DynamicMatrix::exchange_columns");
 
 	using std::swap;
 	for(unsigned k=0; k<columns_; ++k)
-		swap(element(i, k), element(j, k));
+		swap(element(k, i), element(k, j));
 
 	return *this;
 }
 
 template<typename T>
-inline DynamicMatrix<T> &DynamicMatrix<T>::multiply_row(unsigned i, T s)
+inline DynamicMatrix<T> &DynamicMatrix<T>::multiply_column(unsigned i, T s)
 {
-	if(i>=rows_)
-		throw std::out_of_range("DynamicMatrix::multiply_row");
+	if(i>=columns_)
+		throw std::out_of_range("DynamicMatrix::multiply_column");
 
 	for(unsigned k=0; k<columns_; ++k)
-		element(i, k) *= s;
+		element(k, i) *= s;
 
 	return *this;
 }
 
 template<typename T>
-inline DynamicMatrix<T> &DynamicMatrix<T>::add_row(unsigned i, unsigned j, T s)
+inline DynamicMatrix<T> &DynamicMatrix<T>::add_column(unsigned i, unsigned j, T s)
 {
-	if(i>=rows_ || j>=rows_)
-		throw std::out_of_range("DynamicMatrix::exchange_rows");
+	if(i>=columns_ || j>=columns_)
+		throw std::out_of_range("DynamicMatrix::exchange_columns");
 
 	for(unsigned k=0; k<columns_; ++k)
-		element(j, k) += element(i, k)*s;
+		element(k, j) += element(k, i)*s;
 
 	return *this;
 }