diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-13 15:34:28 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-10-13 15:34:28 +0000 |
| commit | ff6ad8b959f6c20380f3d68ebb1bbbf1224adcfd (patch) | |
| tree | df1906b0186dc9d9fa6f1f4b676ada8d0d921d23 /src/Contraction/include/gudhi/Edge_contraction.h | |
| parent | b677f53a744aec6b3edefbd297bba215eb70a4e0 (diff) | |
Manual merge of skb_simplex_insertion after last trunk big modifications on Skbl
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/skb_simplex_insertion_merge@855 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: d7f7721e2963de439a28040196423d4c0df07d3f
Diffstat (limited to 'src/Contraction/include/gudhi/Edge_contraction.h')
| -rw-r--r-- | src/Contraction/include/gudhi/Edge_contraction.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Contraction/include/gudhi/Edge_contraction.h b/src/Contraction/include/gudhi/Edge_contraction.h index dfce8d1b..b996d9fb 100644 --- a/src/Contraction/include/gudhi/Edge_contraction.h +++ b/src/Contraction/include/gudhi/Edge_contraction.h @@ -158,7 +158,7 @@ void build_rips(ComplexType& complex, double offset){ for (auto p = vertices.begin(); p != vertices.end(); ++p) for (auto q = p; ++q != vertices.end(); ) if (eucl_distance(complex.point(*p), complex.point(*q)) < 2 * offset) - complex.add_edge(*p,*q); + complex.add_edge_without_blockers(*p,*q); } int main (int argc, char *argv[]) @@ -194,7 +194,7 @@ int main (int argc, char *argv[]) contractor.contract_edges(); std::cout << "Counting final number of simplices \n"; - unsigned num_simplices = std::distance(complex.simplex_range().begin(),complex.simplex_range().end()); + unsigned num_simplices = std::distance(complex.star_simplex_range().begin(),complex.star_simplex_range().end()); std::cout << "Final complex has "<< complex.num_vertices()<<" vertices, "<< |