From be0cc9153d802c7a1317de9a7ed803cd2f65bd38 Mon Sep 17 00:00:00 2001
From: Gunter Winkler <guwi17@gmx.de>
Date: Sat, 22 Sep 2012 21:03:50 +0000
Subject: [PATCH] * libs/numeric/ublas/test/test_triangular.cpp: switch to
 boost::timer and enable all tests, see #7296

* libs/numeric/ublas/test/Jamfile.v2: add required lib boost_timer

svn path=/trunk/libs/numeric/ublas/; revision=80644
---
 test/Jamfile.v2          |  3 +++
 test/test_triangular.cpp | 47 +++++++++++++++++-----------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0440b847..4dd319c9 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -174,6 +174,9 @@ test-suite numeric/uBLAS
 	  : :
 	  ]
 	  [ run test_triangular.cpp
+        :
+        :
+        : <library>/boost/timer//boost_timer
 	  ]
 	  [ run test_ticket7296.cpp
 	  ]
diff --git a/test/test_triangular.cpp b/test/test_triangular.cpp
index 359b1d11..9a9bf48a 100644
--- a/test/test_triangular.cpp
+++ b/test/test_triangular.cpp
@@ -6,6 +6,7 @@
 #include <boost/numeric/ublas/triangular.hpp>
 #include <boost/numeric/ublas/io.hpp>
 
+#include <boost/timer/timer.hpp>
 
 namespace ublas  = boost::numeric::ublas;
 
@@ -28,7 +29,7 @@ namespace ublas  = boost::numeric::ublas;
 
 
 int main() {
-  const int n=10000;
+  const int n=7000;
 #if 1
   ublas::compressed_matrix<double, ublas::row_major>     mat_row_upp(n, n);
   ublas::compressed_matrix<double, ublas::column_major>  mat_col_upp(n, n);
@@ -71,62 +72,54 @@ int main() {
 
   std::cerr << "Starting..." << std::endl;
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "col_low x: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(mat_col_low,  x, ublas::lower_tag());
-    std::cerr << "Col_low x: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(mat_col_low, x, b) << "\n";
   }
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "row_low x: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(mat_row_low, x, ublas::lower_tag());
-    std::cerr << "Row_low x: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(mat_row_low, x, b) << "\n";
   }
 
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "col_upp x: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(mat_col_upp,  x, ublas::upper_tag());
-    std::cerr << "col_upp x: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(mat_col_upp, x, b) << "\n";
   }
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "row_upp x: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(mat_row_upp, x, ublas::upper_tag());
-    std::cerr << "row_upp x: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(mat_row_upp, x, b) << "\n";
   }
 
-//   {
-//     clock_t start = clock();
-//     ublas::vector<double>  x(b);
-//     ublas::inplace_solve(x, mat_col_low, ublas::lower_tag());
-//     std::cerr << "x col_low: " << clock()-start << std::endl;
-//     std::cerr << "delta: " << diff(x, mat_col_low, b) << "\n";
-//   }
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "x col_low: %t sec CPU, %w sec real\n");
+    ublas::vector<double>  x(b);
+    ublas::inplace_solve(x, mat_col_low, ublas::lower_tag());
+    std::cerr << "delta: " << diff(x, mat_col_low, b) << "\n";
+  }
+  {
+    boost::timer::auto_cpu_timer t(std::cerr, "x row_low: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(x, mat_row_low, ublas::lower_tag());
-    std::cerr << "x row_low: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(x, mat_row_low, b) << "\n";
   }
 
-//   {
-//     clock_t start = clock();
-//     ublas::vector<double>  x(b);
-//     ublas::inplace_solve(x, mat_col_upp, ublas::upper_tag());
-//     std::cerr << "x col_upp: " << clock()-start << std::endl;
-//     std::cerr << "delta: " << diff(x, mat_col_upp, b) << "\n";
-//   }
   {
-    clock_t start = clock();
+    boost::timer::auto_cpu_timer t(std::cerr, "x col_upp: %t sec CPU, %w sec real\n");
+    ublas::vector<double>  x(b);
+    ublas::inplace_solve(x, mat_col_upp, ublas::upper_tag());
+    std::cerr << "delta: " << diff(x, mat_col_upp, b) << "\n";
+  }
+  {
+    boost::timer::auto_cpu_timer t(std::cerr, "x row_upp: %t sec CPU, %w sec real\n");
     ublas::vector<double>  x(b);
     ublas::inplace_solve(x, mat_row_upp, ublas::upper_tag());
-    std::cerr << "x row_upp: " << clock()-start << std::endl;
     std::cerr << "delta: " << diff(x, mat_row_upp, b) << "\n";
   }