12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed unmatched timing statement, reduced default trials in timing scripts

release/4.3a0
Richard Roberts 2010-11-03 22:52:24 +00:00
parent 60e10d7380
commit 898ca38f1c
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtsam/base/DenseQRUtil.cpp
View File

@ -150,19 +150,17 @@ namespace gtsam {
} }
void householder_denseqr_colmajor(ublas::matrix<double, ublas::column_major>& A, int *Stair) { void householder_denseqr_colmajor(ublas::matrix<double, ublas::column_major>& A, int *Stair) {
tic("householder_denseqr");
int m = A.size1(); int m = A.size1();
int n = A.size2(); int n = A.size2();
assert(Stair != NULL); assert(Stair != NULL);
tic("householder_denseqr: denseqr_front"); tic("householder_denseqr");
int npiv = min(m,n); int npiv = min(m,n);
int b = min(min(m,n),32); int b = min(min(m,n),32);
double W[b*(n+b)]; double W[b*(n+b)];
DenseQR(m, n, npiv, A.data().begin(), Stair, W); DenseQR(m, n, npiv, A.data().begin(), Stair, W);
toc("householder_denseqr: denseqr_front"); toc("householder_denseqr");
} }
} // namespace gtsam } // namespace gtsam

2
tests/timeMultifrontalOnDataset.cpp
View File

@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
toc_("Z 2 linearize"); toc_("Z 2 linearize");
tictoc_print_(); tictoc_print_();
for(size_t trial = 0; trial < 100; ++trial) { for(size_t trial = 0; trial < 10; ++trial) {
tic_("Z 3 solve"); tic_("Z 3 solve");
VectorValues soln(*GaussianMultifrontalSolver(*gfg).optimize()); VectorValues soln(*GaussianMultifrontalSolver(*gfg).optimize());

2
tests/timeSequentialOnDataset.cpp
View File

@ -45,7 +45,7 @@ int main(int argc, char *argv[]) {
toc_("Z 2 linearize"); toc_("Z 2 linearize");
tictoc_print_(); tictoc_print_();
for(size_t trial = 0; trial < 100; ++trial) { for(size_t trial = 0; trial < 10; ++trial) {
tic_("Z 3 solve"); tic_("Z 3 solve");
VectorValues soln(*GaussianSequentialSolver(*gfg).optimize()); VectorValues soln(*GaussianSequentialSolver(*gfg).optimize());