From: wolf Date: Mon, 12 Jul 2004 14:13:16 +0000 (+0000) Subject: Fix all that iterator crap that didn't work for matrices with empty lines. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a524cd5f396b1dc498c72e9512041d3fff86e9c7;p=dealii-svn.git Fix all that iterator crap that didn't work for matrices with empty lines. git-svn-id: https://svn.dealii.org/trunk@9512 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/lac/include/lac/block_matrix_base.h b/deal.II/lac/include/lac/block_matrix_base.h index b25abae0ac..b3132ff106 100644 --- a/deal.II/lac/include/lac/block_matrix_base.h +++ b/deal.II/lac/include/lac/block_matrix_base.h @@ -59,10 +59,15 @@ namespace internal * accessors only for read * access, a const matrix * pointer is sufficient. + * + * Place the iterator at the + * beginning of the given row of the + * matrix, or create the end pointer + * if @p row equals the total number + * of rows in the matrix. */ Accessor (const BlockMatrix *m, - const unsigned int row, - const unsigned int index); + const unsigned int row); /** * Row number of the element @@ -71,13 +76,6 @@ namespace internal */ unsigned int row() const; - /** - * Index in row of the element - * represented by this - * object. - */ - unsigned int index() const; - /** * Column number of the * element represented by @@ -103,7 +101,12 @@ namespace internal * this object. */ unsigned int block_column() const; - + + /** + * Exception + */ + DeclException0 (ExcDereferenceEndIterator); + protected: /** * The matrix accessed. @@ -117,21 +120,28 @@ namespace internal typename BlockMatrix::BlockType::const_iterator base_iterator; /** - * Number of block where row lies in. + * Block row into which we presently + * point. */ unsigned int row_block; /** - * Number of block column where - * column lies in. + * Block column into which we + * presently point. */ unsigned int col_block; - - /** - * Index in whole row. - */ - unsigned int a_index; + /** + * Move ahead one element. + */ + void advance (); + + /** + * Compare this accessor with another + * one for equality. + */ + bool operator == (const Accessor &a) const; + /** * Let the iterator class be a * friend. @@ -149,10 +159,15 @@ namespace internal public: /** * Constructor. + * + * Place the iterator at the + * beginning of the given row of the + * matrix, or create the end pointer + * if @p row equals the total number + * of rows in the matrix. */ ConstIterator(const BlockMatrix *matrix, - const unsigned int row, - const unsigned int index); + const unsigned int row); /** * Prefix increment. @@ -786,28 +801,49 @@ namespace internal inline Accessor:: Accessor (const BlockMatrix *matrix, - const unsigned int r, - const unsigned int i) + const unsigned int row) : matrix(matrix), base_iterator(matrix->block(0,0).begin()), row_block(0), - col_block(0), - a_index(0) + col_block(0) { - Assert (i==0, ExcNotImplemented()); - - if (r < matrix->m()) + // check if this is a regular row or + // the end of the matrix + if (row < matrix->m()) { - std::pair indices - = matrix->row_block_indices.global_to_local(r); - row_block = indices.first; - base_iterator = matrix->block(indices.first, 0).begin(indices.second); + const std::pair indices + = matrix->row_block_indices.global_to_local(row); + + // find the first block that does + // have an entry in this row + for (unsigned int bc=0; bcn_block_cols(); ++bc) + { + base_iterator + = matrix->block(indices.first, bc).begin(indices.second); + if (base_iterator != + matrix->block(indices.first, bc).end(indices.second)) + { + row_block = indices.first; + col_block = bc; + return; + } + } + + // hm, there is no block that has + // an entry in this column. we need + // to take the next entry then, + // which may be the first entry of + // the next row, or recursively the + // next row, or so on + *this = Accessor (matrix, row+1); } else { - row_block = matrix->n_block_rows(); - base_iterator = matrix->block(0, 0).begin(); + // we were asked to create the end + // iterator for this matrix + row_block = deal_II_numbers::invalid_unsigned_int; + col_block = deal_II_numbers::invalid_unsigned_int; } } @@ -817,20 +853,11 @@ namespace internal unsigned int Accessor::row() const { - if (row_block < matrix->n_block_rows()) - return (matrix->row_block_indices.local_to_global(row_block, 0) + - base_iterator->row()); - else - return 0; - } - - - template - inline - unsigned int - Accessor::index() const - { - return a_index; + Assert (row_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + + return (matrix->row_block_indices.local_to_global(row_block, 0) + + base_iterator->row()); } @@ -839,12 +866,9 @@ namespace internal unsigned int Accessor::column() const { - // note: the block column should always - // be valid, in contrast to the block - // row, which may be past the end of - // the matrix. thus, unlike in the - // row() function, we do not have to - // if-else here + Assert (col_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + return (matrix->column_block_indices.local_to_global(col_block,0) + base_iterator->column()); } @@ -855,6 +879,9 @@ namespace internal unsigned int Accessor::block_row() const { + Assert (row_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + return row_block; } @@ -864,6 +891,9 @@ namespace internal unsigned int Accessor::block_column() const { + Assert (col_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + return col_block; } @@ -873,85 +903,128 @@ namespace internal typename Accessor::value_type Accessor::value () const { + Assert (row_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + Assert (col_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + return base_iterator->value(); } -//----------------------------------------------------------------------// - - - template - inline - ConstIterator:: - ConstIterator (const BlockMatrix *m, - const unsigned int r, - const unsigned int i) - : - accessor (m, r, i) - {} - - template inline - ConstIterator & - ConstIterator::operator++ () - { - Assert (accessor.row_block < accessor.matrix->n_block_rows(), - ExcIteratorPastEnd()); + void + Accessor::advance () + { + Assert (row_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); + Assert (col_block != deal_II_numbers::invalid_unsigned_int, + ExcDereferenceEndIterator()); // Remember current row inside block - unsigned int local_row = accessor.base_iterator->row(); + unsigned int local_row = base_iterator->row(); - // Advance inside block - ++accessor.base_iterator; - ++accessor.a_index; + // Advance one element inside the + // current block + ++base_iterator; - // If end of row inside block, - // advance to next block - if (accessor.base_iterator == - accessor.matrix->block(accessor.row_block, - accessor.col_block).end(local_row)) + // while we hit the end of the row of a + // block (which may happen multiple + // times if rows inside a block are + // empty), we have to jump to the next + // block and take the + while (base_iterator == + matrix->block(row_block, + col_block).end(local_row)) { - if (accessor.col_block < accessor.matrix->n_block_cols()-1) + // jump to next block in this block + // row, if possible, otherwise go + // to next row + if (col_block < matrix->n_block_cols()-1) { - // Advance to next block in - // row -//TODO: what if this row in that block is empty? - ++accessor.col_block; + ++col_block; + base_iterator + = matrix->block(row_block, col_block).begin(local_row); } else { - // Advance to first block - // in next row - accessor.col_block = 0; - accessor.a_index = 0; + // jump back to next row in + // first block column + col_block = 0; ++local_row; - if (local_row >= - accessor.matrix->block(accessor.row_block,0).m()) + + // see if this has brought us + // past the number of rows in + // this block. if so see + // whether we've just fallen + // off the end of the whole + // matrix + if (local_row == matrix->block(row_block, col_block).m()) { - // If final row in - // block, go to next - // block row local_row = 0; - ++accessor.row_block; + ++row_block; + if (row_block == matrix->n_block_rows()) + { + row_block = deal_II_numbers::invalid_unsigned_int; + col_block = deal_II_numbers::invalid_unsigned_int; + return; + } } + + base_iterator + = matrix->block(row_block, col_block).begin(local_row); } - // Finally, set base_iterator - // to start of row determined - // above - if (accessor.row_block < accessor.matrix->n_block_rows()) - accessor.base_iterator = - accessor.matrix->block(accessor.row_block, accessor.col_block) - .begin(local_row); - else - // Set base_iterator to a - // defined state for - // comparison. This is the - // end() state. -//TODO: this is a particularly bad choice, since it is actually a valid iterator. it should rather be something like the end iterator of the last block! - accessor.base_iterator = accessor.matrix->block(0, 0).begin(); } + } + + + + template + inline + bool + Accessor::operator == (const Accessor &a) const + { + if (matrix != a.matrix) + return false; + + if (row_block == a.row_block + && col_block == a.col_block) + // end iterators do not necessarily + // have to have the same + // base_iterator representation, but + // valid iterators have to + return (((row_block == deal_II_numbers::invalid_unsigned_int) + && + (col_block == deal_II_numbers::invalid_unsigned_int)) + || + (base_iterator == a.base_iterator)); + + return false; + } + + +//----------------------------------------------------------------------// + + + template + inline + ConstIterator:: + ConstIterator (const BlockMatrix *m, + const unsigned int r) + : + accessor (m, r) + {} + + + + template + inline + ConstIterator & + ConstIterator::operator++ () + { + accessor.advance (); return *this; } @@ -993,14 +1066,7 @@ namespace internal ConstIterator:: operator == (const ConstIterator& i) const { - if (accessor.matrix != i.accessor.matrix) - return false; - - if (accessor.row_block == i.accessor.row_block - && accessor.col_block == i.accessor.col_block - && accessor.base_iterator == i.accessor.base_iterator) - return true; - return false; + return (accessor == i.accessor); } @@ -1029,8 +1095,7 @@ namespace internal if (accessor.base_iterator->row() < i.accessor.base_iterator->row()) return true; if (accessor.base_iterator->row() == i.accessor.base_iterator->row()) - if (accessor.a_index < i.accessor.a_index) - return true; + return (accessor.base_iterator < i.accessor.base_iterator); } return false; } @@ -1592,7 +1657,7 @@ inline typename BlockMatrixBase::const_iterator BlockMatrixBase::begin () const { - return const_iterator(this, 0, 0); + return const_iterator(this, 0); } @@ -1602,7 +1667,7 @@ inline typename BlockMatrixBase::const_iterator BlockMatrixBase::end () const { - return const_iterator(this, m(), 0); + return const_iterator(this, m()); } @@ -1613,7 +1678,7 @@ typename BlockMatrixBase::const_iterator BlockMatrixBase::begin (const unsigned int r) const { Assert (r::const_iterator BlockMatrixBase::end (const unsigned int r) const { Assert (r