From: wolf Date: Wed, 17 Nov 1999 08:56:52 +0000 (+0000) Subject: Make n_nonzero_elements inlined, since it is now heavily used in time-critical functi... X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d3a12e5b136612efee756b652bd446d2e3c18da;p=dealii-svn.git Make n_nonzero_elements inlined, since it is now heavily used in time-critical functions of sparse matrices. git-svn-id: https://svn.dealii.org/trunk@1866 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/sparse_matrix.h b/deal.II/lac/include/lac/sparse_matrix.h index e2b0f35155..561f767654 100644 --- a/deal.II/lac/include/lac/sparse_matrix.h +++ b/deal.II/lac/include/lac/sparse_matrix.h @@ -1302,6 +1302,16 @@ SparseMatrixStruct::column_number (const unsigned int row, return colnums[rowstart[row]+index]; } + + +inline +unsigned int +SparseMatrixStruct::n_nonzero_elements () const +{ + Assert ((rowstart!=0) && (colnums!=0), ExcEmptyObject()); + Assert (compressed, ExcNotCompressed()); + return rowstart[rows]-rowstart[0]; +}; template diff --git a/deal.II/lac/source/sparse_matrix.cc b/deal.II/lac/source/sparse_matrix.cc index d0e3554cb3..5c3264d0d5 100644 --- a/deal.II/lac/source/sparse_matrix.cc +++ b/deal.II/lac/source/sparse_matrix.cc @@ -553,11 +553,4 @@ SparseMatrixStruct::bandwidth () const -unsigned int -SparseMatrixStruct::n_nonzero_elements () const { - Assert ((rowstart!=0) && (colnums!=0), ExcEmptyObject()); - Assert (compressed, ExcNotCompressed()); - return rowstart[rows]-rowstart[0]; -}; -