From ff6ad8b959f6c20380f3d68ebb1bbbf1224adcfd Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 13 Oct 2015 15:34:28 +0000 Subject: 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 --- src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp') diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp index 69557694..41b5ee00 100644 --- a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp +++ b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp @@ -37,7 +37,7 @@ using namespace skbl; typedef Skeleton_blocker_complex Complex; typedef Complex::Vertex_handle Vertex_handle; -typedef Complex::Simplex_handle Simplex; +typedef Complex::Simplex Simplex; Complex build_complete_complex(int n) { // build a full complex with n vertices and 2^n-1 simplices @@ -46,8 +46,7 @@ Complex build_complete_complex(int n) { complex.add_vertex(); for (int i = 0; i < n; i++) for (int j = 0; j < i; j++) - // note that add_edge, add the edge and all its cofaces - complex.add_edge(Vertex_handle(i), Vertex_handle(j)); + complex.add_edge_without_blockers(Vertex_handle(i), Vertex_handle(j)); return complex; } @@ -77,7 +76,7 @@ int main(int argc, char *argv[]) { // we use a reference to a simplex instead of a copy // value here because a simplex is a set of integers // and copying it cost time - for (const Simplex & s : complex.simplex_range()) { + for (const Simplex & s : complex.complex_simplex_range()) { ++num_simplices; if (s.dimension() % 2 == 0) euler += 1; -- cgit v1.2.3