summaryrefslogtreecommitdiff
path: root/src/Contraction/include/gudhi/Edge_contraction.h
diff options
context:
space:
mode:
authorvrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-11-23 16:35:23 +0000
committervrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>2015-11-23 16:35:23 +0000
commitb3c3e0d75c717dbd94caf96c9ba827fb17b4d5b3 (patch)
treed4e706c81d54f54438aa681cd666e3854a80a37b /src/Contraction/include/gudhi/Edge_contraction.h
parentfe78c077b00e91b3d316f1d64541008a615664e7 (diff)
parent061e43a2a48525bc5a69482a1ea80f20ff505e55 (diff)
Backmerge of trunk
Add alpha complex in bibtex git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/alphashapes@929 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: c8975be439b3e9e91d1fd6ad988db12c75d0395b
Diffstat (limited to 'src/Contraction/include/gudhi/Edge_contraction.h')
-rw-r--r--src/Contraction/include/gudhi/Edge_contraction.h4
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 011ca9bd..a4c786be 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, "<<