diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:24:36 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2017-01-20 15:24:36 +0000 |
commit | db1398bcf173f372fc3ef7a410e4e72b0192f8cc (patch) | |
tree | 16737fa5c160d4ca431be9dbb29409c2da28aa12 /src/Witness_complex/include | |
parent | 49d726423c3f270f542ca93d43387e0dbcdd0ca9 (diff) |
non-Euclidean example works, but the test not anymore
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1975 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 251638e6417f1059529d57a8a87364a17cf9f5a2
Diffstat (limited to 'src/Witness_complex/include')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h index debbd286..c3edc0b7 100644 --- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h @@ -50,7 +50,7 @@ public: INS_iterator iterator_end_; Active_witness(INS_range search_range) - : search_range_(search_range), iterator_last_(search_range.begin()), iterator_end_(search_range.end()) + : search_range_(search_range), iterator_last_(search_range_.begin()), iterator_end_(search_range_.end()) { nearest_landmark_table_.push_back(*iterator_last_); } 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 5b040914..b0a88662 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 @@ -86,12 +86,13 @@ private : // if the id of the current landmark is the same as the last one if (lh_->first == aw_->iterator_last_->first) { // if the next iterator is end, lh_it = end pointer - if (++(aw_->iterator_last_) == aw_->iterator_end_) { + INS_iterator next_it = aw_->iterator_last_; next_it++; + if (next_it == aw_->iterator_end_) { is_end_ = true; return; } else { - //aw_->iterator_last_ = ++(aw_->iterator_last_); + ++(aw_->iterator_last_); aw_->nearest_landmark_table_.push_back(*(aw_->iterator_last_)); } } diff --git a/src/Witness_complex/include/gudhi/Witness_complex.h b/src/Witness_complex/include/gudhi/Witness_complex.h index 3305a8e2..576b8b0d 100644 --- a/src/Witness_complex/include/gudhi/Witness_complex.h +++ b/src/Witness_complex/include/gudhi/Witness_complex.h @@ -62,7 +62,7 @@ private: typedef Landmark_id Vertex_handle; private: - Nearest_landmark_table_& nearest_landmark_table_; + Nearest_landmark_table_ nearest_landmark_table_; public: ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// |