From 4c6a460fa0e6f534a3129fe49a10989ddcd0a0c8 Mon Sep 17 00:00:00 2001 From: Stephen Williams Date: Mon, 8 Apr 2013 17:42:26 +0000 Subject: [PATCH] Fixed bugs in tic-toc statements for Concurrent Filter and Smoother --- gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp | 4 ++-- gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp b/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp index 4d0c70653..117ce049d 100644 --- a/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp +++ b/gtsam_unstable/nonlinear/ConcurrentBatchFilter.cpp @@ -634,7 +634,7 @@ void ConcurrentBatchFilter::getSummarizedFactors(NonlinearFactorGraph& summarize summarizedFactors.push_back(filterSummarization_); rootValues.insert(rootValues_); - gttic(get_summarized_factors); + gttoc(get_summarized_factors); } /* ************************************************************************* */ @@ -646,7 +646,7 @@ void ConcurrentBatchFilter::getSmootherFactors(NonlinearFactorGraph& smootherFac smootherFactors.push_back(smootherFactors_); smootherValues.insert(smootherValues_); - gttic(get_smoother_factors); + gttoc(get_smoother_factors); } /* ************************************************************************* */ diff --git a/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp b/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp index d00b6d192..c834b0cf3 100644 --- a/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp +++ b/gtsam_unstable/nonlinear/ConcurrentBatchSmoother.cpp @@ -279,7 +279,7 @@ void ConcurrentBatchSmoother::getSummarizedFactors(NonlinearFactorGraph& summari // Copy the previous calculated smoother summarization factors into the output summarizedFactors.push_back(smootherSummarization_); - gttic(get_summarized_factors); + gttoc(get_summarized_factors); } /* ************************************************************************* */ @@ -324,7 +324,7 @@ void ConcurrentBatchSmoother::postsync() { /* ************************************************************************* */ size_t ConcurrentBatchSmoother::insertFactor(const NonlinearFactor::shared_ptr& factor) { - gttic(insert_factor); + gttic(insert_factors); // Insert the factor into an existing hole in the factor graph, if possible size_t slot;