From 20d67edb518e21a93c73f39251588c7e9b03c4f1 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 28 Mar 2017 21:20:01 +0000 Subject: Use only insert (simplex and subfaces) Remove useless initialize_filtration git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/ST_cythonize@2276 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: eed1a67e2f83e3a1945cc24b11454ed1ef024ba6 --- src/cython/include/Simplex_tree_interface.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/cython/include') diff --git a/src/cython/include/Simplex_tree_interface.h b/src/cython/include/Simplex_tree_interface.h index 4266b3ef..154005ae 100644 --- a/src/cython/include/Simplex_tree_interface.h +++ b/src/cython/include/Simplex_tree_interface.h @@ -52,29 +52,30 @@ class Simplex_tree_interface : public Simplex_tree { return (Base::find(vh) != Base::null_simplex()); } + bool insert(const Simplex& simplex, Filtration_value filtration = 0) { + Insertion_result result = Base::insert_simplex_and_subfaces(simplex, filtration); + return (result.second); + } + bool insert_simplex(const Simplex& simplex, Filtration_value filtration = 0) { Insertion_result result = Base::insert_simplex(simplex, filtration); - Base::initialize_filtration(); return (result.second); } bool insert_simplex_and_subfaces(const Simplex& simplex, Filtration_value filtration = 0) { Insertion_result result = Base::insert_simplex_and_subfaces(simplex, filtration); - Base::initialize_filtration(); return (result.second); } // Do not interface this function, only used in strong witness interface for complex creation bool insert_simplex(const std::vector& complex, Filtration_value filtration = 0) { Insertion_result result = Base::insert_simplex(complex, filtration); - Base::initialize_filtration(); return (result.second); } // Do not interface this function, only used in strong witness interface for complex creation bool insert_simplex_and_subfaces(const std::vector& complex, Filtration_value filtration = 0) { Insertion_result result = Base::insert_simplex_and_subfaces(complex, filtration); - Base::initialize_filtration(); return (result.second); } @@ -88,6 +89,7 @@ class Simplex_tree_interface : public Simplex_tree { } Complex get_filtered_tree() { + Base::initialize_filtration(); Complex filtered_tree; for (auto f_simplex : Base::filtration_simplex_range()) { Simplex simplex; @@ -140,6 +142,7 @@ class Simplex_tree_interface : public Simplex_tree { } void create_persistence(Gudhi::Persistent_cohomology_interface* pcoh) { + Base::initialize_filtration(); pcoh = new Gudhi::Persistent_cohomology_interface(*this); } }; -- cgit v1.2.3