From 26ccabbd6892ddc5313a7f75c98a92c268f15747 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 9 Jun 2017 08:39:16 +0000
Subject: Remove boost timer and chrono dependencies

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

Former-commit-id: 5bfb8bd5a6e49dbea9fbfbdc1d748423fc930913
---
 src/Contraction/example/Garland_heckbert.cpp | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'src/Contraction/example/Garland_heckbert.cpp')

diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp
index 8b5a6a6c..2b0dc973 100644
--- a/src/Contraction/example/Garland_heckbert.cpp
+++ b/src/Contraction/example/Garland_heckbert.cpp
@@ -30,7 +30,6 @@
 #include <gudhi/Skeleton_blocker.h>
 #include <gudhi/Off_reader.h>
 
-#include <boost/timer/timer.hpp>
 #include <iostream>
 
 #include "Garland_heckbert/Error_quadric.h"
@@ -165,8 +164,6 @@ int main(int argc, char *argv[]) {
 
   int num_contractions = atoi(argv[3]);
 
-  boost::timer::auto_cpu_timer t;
-
   // constructs the contractor object with Garland Heckbert policies.
   Complex_contractor contractor(complex,
                                 new GH_cost(complex),
-- 
cgit v1.2.3


From 7260c86a2158b0df3f33b49f314201dd51044563 Mon Sep 17 00:00:00 2001
From: vrouvrea <vrouvrea@636b058d-ea47-450e-bf9e-a15bfbe3eedb>
Date: Fri, 9 Jun 2017 12:20:12 +0000
Subject: Rewrite Contraction and Skeleton blocker time display using
 Gudhi::Clock

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

Former-commit-id: e2b5c1e152fd7bdca9d07db0390944409942ba53
---
 src/Contraction/example/Garland_heckbert.cpp                | 5 +++++
 src/Contraction/example/Rips_contraction.cpp                | 5 +++++
 src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp | 3 +++
 src/common/include/gudhi/Clock.h                            | 2 +-
 4 files changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/Contraction/example/Garland_heckbert.cpp')

diff --git a/src/Contraction/example/Garland_heckbert.cpp b/src/Contraction/example/Garland_heckbert.cpp
index 2b0dc973..f0cde95e 100644
--- a/src/Contraction/example/Garland_heckbert.cpp
+++ b/src/Contraction/example/Garland_heckbert.cpp
@@ -29,6 +29,7 @@
 #include <gudhi/Edge_contraction.h>
 #include <gudhi/Skeleton_blocker.h>
 #include <gudhi/Off_reader.h>
+#include <gudhi/Clock.h>
 
 #include <iostream>
 
@@ -164,6 +165,8 @@ int main(int argc, char *argv[]) {
 
   int num_contractions = atoi(argv[3]);
 
+  Gudhi::Clock contraction_chrono("Time to simplify and enumerate simplices");
+
   // constructs the contractor object with Garland Heckbert policies.
   Complex_contractor contractor(complex,
                                 new GH_cost(complex),
@@ -179,6 +182,8 @@ int main(int argc, char *argv[]) {
       complex.num_edges() << " edges and " <<
       complex.num_triangles() << " triangles." << std::endl;
 
+  std::cout << contraction_chrono;
+
   // write simplified complex
   Gudhi::skeleton_blocker::Skeleton_blocker_off_writer<Complex> off_writer(argv[2], complex);
 
diff --git a/src/Contraction/example/Rips_contraction.cpp b/src/Contraction/example/Rips_contraction.cpp
index 1b97f877..501b0e87 100644
--- a/src/Contraction/example/Rips_contraction.cpp
+++ b/src/Contraction/example/Rips_contraction.cpp
@@ -23,6 +23,7 @@
 #include <gudhi/Skeleton_blocker.h>
 #include <gudhi/Off_reader.h>
 #include <gudhi/Point.h>
+#include <gudhi/Clock.h>
 
 #include <iostream>
 
@@ -67,6 +68,8 @@ int main(int argc, char *argv[]) {
 
   build_rips(complex, atof(argv[2]));
 
+  Gudhi::Clock contraction_chrono("Time to simplify and enumerate simplices");
+
   std::cout << "Initial complex has " <<
       complex.num_vertices() << " vertices and " <<
       complex.num_edges() << " edges" << std::endl;
@@ -87,6 +90,8 @@ int main(int argc, char *argv[]) {
       complex.num_blockers() << " blockers and " <<
       num_simplices << " simplices" << std::endl;
 
+  std::cout << contraction_chrono;
+
   return EXIT_SUCCESS;
 }
 
diff --git a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
index 4a0044e1..08ff0264 100644
--- a/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
+++ b/src/Skeleton_blocker/example/Skeleton_blocker_iteration.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <gudhi/Skeleton_blocker.h>
+#include <gudhi/Clock.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,6 +46,7 @@ Complex build_complete_complex(int n) {
 }
 
 int main(int argc, char *argv[]) {
+  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
@@ -78,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;
 }
diff --git a/src/common/include/gudhi/Clock.h b/src/common/include/gudhi/Clock.h
index eff48e41..b83de2f5 100644
--- a/src/common/include/gudhi/Clock.h
+++ b/src/common/include/gudhi/Clock.h
@@ -62,7 +62,7 @@ class Clock {
     if (!clock.msg.empty())
       stream << clock.msg << ": ";
 
-    stream << clock.num_seconds() << "s";
+    stream << clock.num_seconds() << "s\n";
     return stream;
   }
 
-- 
cgit v1.2.3