Merge from trunk.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/qt5@1848 636b058d-ea47-450e-bf9e-a15bfbe3eedb

Former-commit-id: c8e1376894207c8c08896f750f71c115e07f6d95

1 files changed, 3 insertions, 4 deletions

diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp
index d21246ed..7f19e239 100644
--- a/src/Contraction/example/Rips_contraction.cpp
+++ b/src/Contraction/example/Rips_contraction.cpp
@@ -27,9 +27,8 @@
 #include <boost/timer/timer.hpp>
 #include <iostream>
 
-using namespace std;
 using namespace Gudhi;
-using namespace skbl;
+using namespace skeleton_blocker;
 using namespace contraction;
 
 struct Geometry_trait {
@@ -49,7 +48,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 (squared_dist(complex.point(*p), complex.point(*q)) < 4 * offset * offset)
-        complex.add_edge(*p, *q);
+        complex.add_edge_without_blockers(*p, *q);
     }
 }
 
@@ -87,7 +86,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.complex_simplex_range().begin(), complex.complex_simplex_range().end());
 
   std::cout << "Final complex has " <<
       complex.num_vertices() << " vertices, " <<