diff options
| author | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-16 10:50:57 +0000 |
|---|---|---|
| committer | vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2015-11-16 10:50:57 +0000 |
| commit | da50b2dc9acbd67df5c1faf8fd5d8938574b08cb (patch) | |
| tree | 8643273c5106cf998dff4318b71df64cdab44134 /src/Contraction/include/gudhi/Edge_contraction.h | |
| parent | b15b9c7f6f5dd232dee897c96d65f5f77e215314 (diff) | |
| parent | c6c91153dde643af2c5b9c78a1b1b9b65349c292 (diff) | |
backmerge of skb_simplex_insertion_mergedevelopment
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@925 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 923de101fab769e597e39975a89f8e59d00e2cce
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 349bb7d8..ee3e3de1 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, "<< |