diff options
author | Marc Glisse <marc.glisse@inria.fr> | 2020-04-23 14:51:53 +0200 |
---|---|---|
committer | Marc Glisse <marc.glisse@inria.fr> | 2020-04-23 14:51:53 +0200 |
commit | 031e6879f94503e5250c005f8cb71e581799d2f3 (patch) | |
tree | 500c55f4b47a33b933f03ffad16b8c26df121830 /src/python/include/Simplex_tree_interface.h | |
parent | 65f6ca41a9cd6574a0ca8fa9b781c787064fe4ed (diff) | |
parent | e3f276ab5b7503ba7ce278fffbf73ebe66d6351c (diff) |
Merge remote-tracking branch 'origin/master' into compute_persistence
Diffstat (limited to 'src/python/include/Simplex_tree_interface.h')
-rw-r--r-- | src/python/include/Simplex_tree_interface.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/python/include/Simplex_tree_interface.h b/src/python/include/Simplex_tree_interface.h index 27b123f8..56d7c41d 100644 --- a/src/python/include/Simplex_tree_interface.h +++ b/src/python/include/Simplex_tree_interface.h @@ -41,16 +41,19 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> { Extended_filtration_data efd; - bool find_simplex(const Simplex& vh) { - return (Base::find(vh) != Base::null_simplex()); + bool find_simplex(const Simplex& simplex) { + return (Base::find(simplex) != Base::null_simplex()); } - void assign_simplex_filtration(const Simplex& vh, Filtration_value filtration) { - Base::assign_filtration(Base::find(vh), filtration); + void assign_simplex_filtration(const Simplex& simplex, Filtration_value filtration) { + Base::assign_filtration(Base::find(simplex), filtration); + Base::clear_filtration(); } bool insert(const Simplex& simplex, Filtration_value filtration = 0) { Insertion_result result = Base::insert_simplex_and_subfaces(simplex, filtration); + if (result.first != Base::null_simplex()) + Base::clear_filtration(); return (result.second); } @@ -84,7 +87,7 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> { void remove_maximal_simplex(const Simplex& simplex) { Base::remove_maximal_simplex(Base::find(simplex)); - Base::initialize_filtration(); + Base::clear_filtration(); } Simplex_and_filtration get_simplex_and_filtration(Simplex_handle f_simplex) { @@ -121,7 +124,6 @@ class Simplex_tree_interface : public Simplex_tree<SimplexTreeOptions> { void compute_extended_filtration() { this->efd = this->extend_filtration(); - this->initialize_filtration(); return; } |