Merge of branch boost_system_no_deprecated_test in order to :

- remove boost_system library dependency
- repair conda package compilation issues found
- Use Gudhi::Clock instead of boost::date_time library



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

Former-commit-id: d68764ab186bd44f2b2253ba21ad1c0e09584455

1 files changed, 3 insertions, 4 deletions

diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp
index 8289b1d3..501b0e87 100644
--- a/src/Contraction/example/Rips_contraction.cpp
+++ b/src/Contraction/example/Rips_contraction.cpp
@@ -23,8 +23,8 @@
 #include <gudhi/Skeleton_blocker.h>
 #include <gudhi/Off_reader.h>
 #include <gudhi/Point.h>
+#include <gudhi/Clock.h>
 
-#include <boost/timer/timer.hpp>
 #include <iostream>
 
 struct Geometry_trait {
@@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
 
   build_rips(complex, atof(argv[2]));
 
-  boost::timer::auto_cpu_timer t;
+  Gudhi::Clock contraction_chrono("Time to simplify and enumerate simplices");
 
   std::cout << "Initial complex has " <<
       complex.num_vertices() << " vertices and " <<
@@ -90,8 +90,7 @@ int main(int argc, char *argv[]) {
       complex.num_blockers() << " blockers and " <<
       num_simplices << " simplices" << std::endl;
 
-
-  std::cout << "Time to simplify and enumerate simplices:\n";
+  std::cout << contraction_chrono;
 
   return EXIT_SUCCESS;
 }