diff options
Diffstat (limited to 'src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h')
-rw-r--r-- | src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h index ae051bea..dd1501c3 100644 --- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h @@ -54,18 +54,17 @@ class Active_witness_iterator Active_witness *aw_; Pair_iterator lh_; // landmark handle - //INS_iterator iterator_last; - //INS_iterator iterator_end; + bool is_end_; // true only if the pointer is end and there are no more neighbors to add public: Active_witness_iterator(Active_witness* aw) - : aw_(aw), lh_(aw_->end_pointer) + : aw_(aw), lh_(aw_->nearest_landmark_table_.end()), is_end_(true) { } Active_witness_iterator(Active_witness* aw, Pair_iterator lh) - : aw_(aw), lh_(lh) - { + : aw_(aw), lh_(lh), is_end_(false) + { } private : @@ -77,7 +76,7 @@ private : bool equal(const Iterator& other) const { - return (lh_ == other.lh_); + return (is_end_ == other.is_end_) || (lh_ == other.lh_); } void increment() @@ -85,7 +84,7 @@ private : // if neighbor search is at its end, check if lh_++ is end if (aw_->iterator_last_ == aw_->iterator_end_) { if (lh_++ == aw_->nearest_landmark_table_.end()) { - lh_ = aw_->end_pointer; + is_end_ = true; return; } return; @@ -94,7 +93,7 @@ private : if (lh_->first == aw_->iterator_last_->first) { // if the next iterator is end, lh_it = end pointer if (++(aw_->iterator_last_) == aw_->iterator_end_) { - lh_ = aw_->end_pointer; + is_end_ = true; return; } else |