From 898ca38f1cacb06eceb0249c108b41d7d3726261 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Wed, 3 Nov 2010 22:52:24 +0000 Subject: [PATCH] Removed unmatched timing statement, reduced default trials in timing scripts --- gtsam/base/DenseQRUtil.cpp | 6 ++---- tests/timeMultifrontalOnDataset.cpp | 2 +- tests/timeSequentialOnDataset.cpp | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/gtsam/base/DenseQRUtil.cpp b/gtsam/base/DenseQRUtil.cpp index 249f4dfe0..32e26742a 100644 --- a/gtsam/base/DenseQRUtil.cpp +++ b/gtsam/base/DenseQRUtil.cpp @@ -150,19 +150,17 @@ namespace gtsam { } void householder_denseqr_colmajor(ublas::matrix& A, int *Stair) { - tic("householder_denseqr"); - int m = A.size1(); int n = A.size2(); assert(Stair != NULL); - tic("householder_denseqr: denseqr_front"); + tic("householder_denseqr"); int npiv = min(m,n); int b = min(min(m,n),32); double W[b*(n+b)]; DenseQR(m, n, npiv, A.data().begin(), Stair, W); - toc("householder_denseqr: denseqr_front"); + toc("householder_denseqr"); } } // namespace gtsam diff --git a/tests/timeMultifrontalOnDataset.cpp b/tests/timeMultifrontalOnDataset.cpp index 6ba5503be..dcd8470b5 100644 --- a/tests/timeMultifrontalOnDataset.cpp +++ b/tests/timeMultifrontalOnDataset.cpp @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { toc_("Z 2 linearize"); tictoc_print_(); - for(size_t trial = 0; trial < 100; ++trial) { + for(size_t trial = 0; trial < 10; ++trial) { tic_("Z 3 solve"); VectorValues soln(*GaussianMultifrontalSolver(*gfg).optimize()); diff --git a/tests/timeSequentialOnDataset.cpp b/tests/timeSequentialOnDataset.cpp index 2850e2e32..9be51d0ad 100644 --- a/tests/timeSequentialOnDataset.cpp +++ b/tests/timeSequentialOnDataset.cpp @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { toc_("Z 2 linearize"); tictoc_print_(); - for(size_t trial = 0; trial < 100; ++trial) { + for(size_t trial = 0; trial < 10; ++trial) { tic_("Z 3 solve"); VectorValues soln(*GaussianSequentialSolver(*gfg).optimize());