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_iterator.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_iterator.h')
-rw-r--r-- | src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h | 5 |
1 files changed, 3 insertions, 2 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 cd4f4b92..658405f6 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 @@ -42,7 +42,7 @@ class Active_witness_iterator friend class boost::iterator_core_access; //typedef Active_witness<Id_distance_pair, INS_iterator> Active_witness; - typedef typename std::vector<Id_distance_pair>::iterator Pair_iterator; + typedef typename std::list<Id_distance_pair>::iterator Pair_iterator; typedef typename Gudhi::witness_complex::Active_witness_iterator<Active_witness, Id_distance_pair, INS_iterator> Iterator; @@ -57,7 +57,8 @@ public: { } - Active_witness_iterator(Active_witness* aw, Pair_iterator lh_) + Active_witness_iterator(Active_witness* aw, Pair_iterator lh) + : aw_(aw), lh_(lh) { } |