From: Wolfgang Bangerth Date: Wed, 22 Apr 2015 12:14:23 +0000 (-0500) Subject: Remove deprecated row_iterator type and corresponding functions row_begin() and row_e... X-Git-Tag: v8.3.0-rc1~211^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F867%2Fhead;p=dealii.git Remove deprecated row_iterator type and corresponding functions row_begin() and row_end() from sparsity pattern classes. --- diff --git a/doc/news/changes.h b/doc/news/changes.h index 7c10dafcb5..8ab27c9fd8 100644 --- a/doc/news/changes.h +++ b/doc/news/changes.h @@ -214,6 +214,10 @@ inconvenience this causes. - SparsityPattern::partition. - SparsityPattern::get_rowstart_indices and SparsityPattern::get_column_numbers. + - SparsityPattern::row_iterator and corresponding row_begin() and row_end() + functions. + - CompressedSparsityPattern::row_iterator and corresponding row_begin() + and row_end() functions. - The typedef CompressedBlockSparsityPattern. - The deprecated constructors of SparsityPattern iterator classes. - The deprecated variants of DoFTools::make_periodicity_constraints. diff --git a/include/deal.II/lac/dynamic_sparsity_pattern.h b/include/deal.II/lac/dynamic_sparsity_pattern.h index 6d1cb08a37..363904ba66 100644 --- a/include/deal.II/lac/dynamic_sparsity_pattern.h +++ b/include/deal.II/lac/dynamic_sparsity_pattern.h @@ -316,12 +316,6 @@ public: DynamicSparsityPatternIterators::Iterator const_iterator; - /** - * An iterator that can be used to iterate over the elements of a single - * row. The result of dereferencing such an iterator is a column index. - */ - typedef std::vector::const_iterator row_iterator; - /** * Initialize as an empty object. This is * useful if you want such objects as member variables in other classes. You @@ -528,17 +522,6 @@ public: */ iterator end (const size_type r) const; - /** - * Return an iterator that can loop over all entries in the given row. - * Dereferencing the iterator yields a column index. - */ - row_iterator row_begin (const size_type row) const; - - /** - * Returns the end of the current row. - */ - row_iterator row_end (const size_type row) const; - // @} /** @@ -1089,28 +1072,6 @@ DynamicSparsityPattern::end (const size_type r) const -inline -DynamicSparsityPattern::row_iterator -DynamicSparsityPattern::row_begin (const size_type row) const -{ - Assert (row < n_rows(), ExcIndexRangeType (row, 0, n_rows())); - const size_type local_row = rowset.size() ? rowset.index_within_set(row) : row; - return lines[local_row].entries.begin(); -} - - - -inline -DynamicSparsityPattern::row_iterator -DynamicSparsityPattern::row_end (const size_type row) const -{ - Assert (row < n_rows(), ExcIndexRangeType (row, 0, n_rows())); - const size_type local_row = rowset.size() ? rowset.index_within_set(row) : row; - return lines[local_row].entries.end(); -} - - - inline const IndexSet & DynamicSparsityPattern::row_index_set () const diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h index 2295d43ab1..d8a0d93a6e 100644 --- a/include/deal.II/lac/sparsity_pattern.h +++ b/include/deal.II/lac/sparsity_pattern.h @@ -339,15 +339,6 @@ public: SparsityPatternIterators::Iterator const_iterator; - /** - * Typedef an iterator class that allows to walk over the nonzero elements - * of a row of a sparsity pattern. - * - * @deprecated This typedef is deprecated. Use proper iterators instead. - */ - typedef - const size_type *row_iterator; - /** * Typedef an iterator class that allows to walk over all nonzero elements * of a sparsity pattern. @@ -950,42 +941,10 @@ public: template void load (Archive &ar, const unsigned int version); -// @} - /** - * @name Deprecated functions - */ -// @{ - - - /** - * STL-like iterator with the first entry of row r. - * - * Note that if the given row is empty, i.e. does not contain any nonzero - * entries, then the iterator returned by this function equals - * end(r). Note also that the iterator may not be dereferencable in - * that case. - * - * @deprecated Use the iterators provided by the begin() and end() functions - * instead. - */ - row_iterator row_begin (const size_type r) const DEAL_II_DEPRECATED; - - /** - * Final iterator of row r. It points to the first element past the - * end of line @p r, or past the end of the entire sparsity pattern. - * - * Note that the end iterator is not necessarily dereferencable. This is in - * particular the case if it is the end iterator for the last row of a - * matrix. - * - * @deprecated Use the iterators provided by the begin() and end() functions - * instead. - */ - row_iterator row_end (const size_type r) const DEAL_II_DEPRECATED; + BOOST_SERIALIZATION_SPLIT_MEMBER() // @} - BOOST_SERIALIZATION_SPLIT_MEMBER() /** * @addtogroup Exceptions * @{ @@ -1368,26 +1327,6 @@ SparsityPattern::end (const size_type r) const -inline -SparsityPattern::row_iterator -SparsityPattern::row_begin (const size_type r) const -{ - Assert (r(r,0,n_rows())); - return &colnums[rowstart[r]]; -} - - - -inline -SparsityPattern::row_iterator -SparsityPattern::row_end (const size_type r) const -{ - Assert (r(r,0,n_rows())); - return &colnums[rowstart[r+1]]; -} - - - inline SparsityPattern::size_type SparsityPattern::n_rows () const