diff options
author | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-30 10:06:39 +0000 |
---|---|---|
committer | skachano <skachano@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-09-30 10:06:39 +0000 |
commit | 350b400fa0fb49c190b5b62934fa58869f23f4c4 (patch) | |
tree | 633ff8f3e1d6ce0fa31be1f7c6ef225de8ca7c16 /src/Witness_complex/include/gudhi/Active_witness/Active_witness.h | |
parent | e1eab27ee280826a5c9c44d530679626da2efb1f (diff) |
Weak Witness + Active Witness. It seems to work.
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/relaxed-witness@1595 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 04b616907f9173e7b3cffebcd8b167a0413eb687
Diffstat (limited to 'src/Witness_complex/include/gudhi/Active_witness/Active_witness.h')
-rw-r--r-- | src/Witness_complex/include/gudhi/Active_witness/Active_witness.h | 7 |
1 files changed, 4 insertions, 3 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 87981c25..7b169784 100644 --- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h +++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h @@ -38,8 +38,9 @@ public: typedef Active_witness<Id_distance_pair, INS_range> ActiveWitness; typedef typename INS_range::iterator INS_iterator; typedef Active_witness_iterator< ActiveWitness, Id_distance_pair, INS_iterator > iterator; + typedef typename std::list<Id_distance_pair> Table; - std::vector<Id_distance_pair> nearest_landmark_table_; + Table nearest_landmark_table_; INS_range search_range_; INS_iterator iterator_last_; INS_iterator iterator_end_; @@ -60,8 +61,8 @@ public: return iterator(this); } - std::vector<Id_distance_pair> end_element_table_; - typename std::vector<Id_distance_pair>::iterator end_pointer = end_element_table_.end(); + Table end_element_table_ = {Id_distance_pair(-1,0)}; + typename Table::iterator end_pointer = end_element_table_.begin(); }; } |