diff options
| author | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-18 14:35:02 +0000 |
|---|---|---|
| committer | salinasd <salinasd@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2014-12-18 14:35:02 +0000 |
| commit | 555a4f62e6a19a51ac16cd0a90535c33bbade178 (patch) | |
| tree | 7dfc831df746ab07414cde41c74d70ad545ef548 /src/Skeleton_blocker | |
| parent | f3b0595a69340ca5fee47b8c5686f69262beaa58 (diff) | |
skbl addsimplex
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@383 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 418f39a0f7b1e9109976f6376516f15e1612398b
Diffstat (limited to 'src/Skeleton_blocker')
3 files changed, 6 insertions, 15 deletions
diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h index 02dffc15..15425384 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_complex.h @@ -1422,9 +1422,7 @@ unsigned make_complex_from_top_faces(Complex& complex,SimplexHandleIterator begi return simplices.size(); } - - -} +} // namespace skbl } // namespace GUDHI diff --git a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h index d254222d..f70e585d 100644 --- a/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h +++ b/src/Skeleton_blocker/include/gudhi/Skeleton_blocker_simplifiable_complex.h @@ -258,19 +258,13 @@ public: } /** - * @brief add the simplex plus all its cofaces - * @details in the case where sigma is a vertex, the simplex - * added has an id which is set to the number of vertices + * @brief add a maximal simplex plus all its cofaces. + * @details the simplex must have dimension greater than one (otherwise use add_vertex or add_edge). */ void add_simplex(const Simplex_handle& sigma){ assert(!this->contains(sigma)); - if (sigma.dimension()==0) - this->add_vertex(); - else - if (sigma.dimension()==1) - this->add_edge(sigma.first_vertex(),sigma.last_vertex()); - else - remove_blocker_include_in_simplex(sigma); + assert(sigma.dimension()>1); + remove_blocker_include_in_simplex(sigma); } private: diff --git a/src/Skeleton_blocker/test/TestSimplifiable.cpp b/src/Skeleton_blocker/test/TestSimplifiable.cpp index 49c064c1..01767424 100644 --- a/src/Skeleton_blocker/test/TestSimplifiable.cpp +++ b/src/Skeleton_blocker/test/TestSimplifiable.cpp @@ -253,7 +253,6 @@ bool test_add_simplex(){ bool test_add_simplex2(){ Complex complex(5); build_complete(4,complex); - complex.add_blocker(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2))); // Print result cerr << "initial complex:\n"<< complex.to_string(); cerr <<endl<<endl; @@ -269,7 +268,7 @@ bool test_add_simplex2(){ copy.add_simplex(simplex); } - complex.add_simplex(Simplex_handle(Vertex_handle(0),Vertex_handle(1),Vertex_handle(2),Vertex_handle(3))); + cerr << "complex after add_simplex:\n"<< complex.to_string(); return complex.num_blockers()==copy.num_blockers() && |