Merge last trunk modifications

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

Former-commit-id: 09efbfb4db1c3bab606b63b3365ca5451ab3d029

1 files changed, 3 insertions, 4 deletions

diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
index 6a1bc480..08ff0264 100644
--- a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
+++ b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
@@ -21,8 +21,7 @@
  */
 
 #include <gudhi/Skeleton_blocker.h>
-
-#include <boost/timer/timer.hpp>
+#include <gudhi/Clock.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -47,8 +46,7 @@ Complex build_complete_complex(int n) {
 }
 
 int main(int argc, char *argv[]) {
-  boost::timer::auto_cpu_timer t;
-
+  Gudhi::Clock skbl_chrono("Time to build the complete complex, enumerate simplices and Euler Characteristic");
   const int n = 15;
 
   // build a full complex with n vertices and 2^n-1 simplices
@@ -82,5 +80,6 @@ int main(int argc, char *argv[]) {
   std::cout << "Saw " << num_vertices << " vertices, " << num_edges << " edges and " << num_simplices << " simplices"
       << std::endl;
   std::cout << "The Euler Characteristic is " << euler << std::endl;
+  std::cout << skbl_chrono;
   return EXIT_SUCCESS;
 }