Skip to content
Snippets Groups Projects
Commit f66e0300 authored by Oliver Sander's avatar Oliver Sander
Browse files

deprecated operator() is gone

[[Imported from SVN: r1669]]
parent 5a0c220e
No related branches found
No related tags found
No related merge requests found
......@@ -42,18 +42,6 @@ namespace Dune {
data[i] = 0;
}
/** \brief The index operator */
T& operator()(int row, int col) DUNE_DEPRECATED {
assert(0<=row && row<rows_ && 0<=col && col<cols_);
return data[row*cols_ + col];
}
/** \brief The const index operator */
const T& operator()(int row, int col) const DUNE_DEPRECATED {
assert(0<=row && row<rows_ && 0<=col && col<cols_);
return data[row*cols_ + col];
}
/** \brief The index operator */
T* operator[](int row) {
assert(0<=row && row<rows_);
......@@ -90,7 +78,7 @@ namespace Dune {
Matrix<T> operator*=(const T& scalar) {
for (int row=0; row<rows_; row++)
for (int col=0; col<cols_; col++)
(*this)(row, col) *= scalar;
(*this)[row][col] *= scalar;
return (*this);
}
......@@ -100,7 +88,7 @@ namespace Dune {
Matrix out(cols(), rows());
for (int i=0; i<rows(); i++)
for (int j=0; j<cols(); j++)
out(j,i) = (*this)(i,j);
out[j][i] = (*this)[i][j];
return out;
}
......@@ -113,7 +101,7 @@ namespace Dune {
for (int i=0; i<out.size(); i++ ) {
for ( int j=0; j<vec.size(); j++ )
out[i] += (*this)(j,i)*vec[j];
out[i] += (*this)[j][i]*vec[j];
}
return out;
......@@ -128,7 +116,7 @@ namespace Dune {
for (int i=0; i<out.rows(); i++ ) {
for ( int j=0; j<out.cols(); j++ )
for (int k=0; k<m1.cols(); k++)
out(i,j) += m1(i,k)*m2(k,j);
out[i][j] += m1[i][k]*m2[k][j];
}
return out;
......@@ -142,7 +130,7 @@ namespace Dune {
for (int i=0; i<out.size(); i++ ) {
for ( int j=0; j<vec.size(); j++ )
out[i] += m(i,j)*vec[j];
out[i] += m[i][j]*vec[j];
}
return out;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment