diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-01-15 13:20:12 +0000 |
| commit | 6a8f01b2d30abda7e6184d9a4eb21460ae36d7d2 (patch) | |
| tree | 8349679953459a9141624fe8aaa3577f580e9cae /src/Skeleton_blocker | |
| parent | aa82d3856abe9e7b009c2c5bfa01540b82e17fdd (diff) | |
| parent | 059c906152ca90608238bc82b07d8e28e18218dc (diff) | |
Merged latest trunk changes to my_branch and fix
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/TDA_dev_1.1.0@409 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 2463ee9b0f8b69e3edbda4e8189eb61606e0af93
Diffstat (limited to 'src/Skeleton_blocker')
| -rw-r--r-- | src/Skeleton_blocker/test/TestSimplifiable.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/Skeleton_blocker/test/TestSimplifiable.cpp b/src/Skeleton_blocker/test/TestSimplifiable.cpp index 01767424..78412754 100644 --- a/src/Skeleton_blocker/test/TestSimplifiable.cpp +++ b/src/Skeleton_blocker/test/TestSimplifiable.cpp @@ -251,25 +251,28 @@ bool test_add_simplex(){ } bool test_add_simplex2(){ - Complex complex(5); + Complex complex; build_complete(4,complex); // Print result cerr << "initial complex:\n"<< complex.to_string(); cerr <<endl<<endl; - Complex copy; + Complex copy(complex.num_vertices()); std::vector<Simplex_handle> simplices(complex.simplex_range().begin(),complex.simplex_range().end()); sort(simplices.begin(),simplices.end(),[&](const Simplex_handle& s1,const Simplex_handle& s2){ return s1.dimension()<s2.dimension(); }); for(const auto & simplex : simplices){ - if(!copy.contains(simplex)) + if(!copy.contains(simplex) && simplex.dimension()==1) + copy.add_edge(simplex.first_vertex(),simplex.last_vertex()); + if(!copy.contains(simplex) && simplex.dimension()>1) copy.add_simplex(simplex); } - cerr << "complex after add_simplex:\n"<< complex.to_string(); + cerr << "complex after add_simplex:\n"<< copy.to_string(); + return complex.num_blockers()==copy.num_blockers() && complex.num_edges()==copy.num_edges() && |