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

Fixed a mismatched tic/toc and added a couple needed function entry tics

release/4.3a0
Richard Roberts 2014-02-28 17:36:07 -05:00
parent 2ea8b8243e
commit 87c2f8a7ff
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/base/SymmetricBlockMatrix.cpp
View File

@ -61,7 +61,7 @@ namespace gtsam {
// Split conditional // Split conditional
// Create one big conditionals with many frontal variables. // Create one big conditionals with many frontal variables.
gttic(Construct_eliminated); gttic(Construct_conditional);
const size_t varDim = offset(nFrontals); const size_t varDim = offset(nFrontals);
VerticalBlockMatrix Ab = VerticalBlockMatrix::LikeActiveViewOf(*this, varDim); VerticalBlockMatrix Ab = VerticalBlockMatrix::LikeActiveViewOf(*this, varDim);
Ab.full() = matrix_.topRows(varDim); Ab.full() = matrix_.topRows(varDim);

2
gtsam/base/cholesky.cpp
View File

@ -120,6 +120,8 @@ pair<size_t,bool> choleskyCareful(Matrix& ATA, int order) {
/* ************************************************************************* */ /* ************************************************************************* */
bool choleskyPartial(Matrix& ABC, size_t nFrontal) { bool choleskyPartial(Matrix& ABC, size_t nFrontal) {
gttic(choleskyPartial);
const bool debug = ISDEBUG("choleskyPartial"); const bool debug = ISDEBUG("choleskyPartial");
assert(ABC.rows() == ABC.cols()); assert(ABC.rows() == ABC.cols());

1
gtsam/linear/HessianFactor.cpp
View File

@ -269,6 +269,7 @@ HessianFactor::HessianFactor(const GaussianFactor& gf) :
HessianFactor::HessianFactor(const GaussianFactorGraph& factors, HessianFactor::HessianFactor(const GaussianFactorGraph& factors,
boost::optional<const Scatter&> scatter) boost::optional<const Scatter&> scatter)
{ {
gttic(HessianFactor_MergeConstructor);
boost::optional<Scatter> computedScatter; boost::optional<Scatter> computedScatter;
if(!scatter) { if(!scatter) {
computedScatter = Scatter(factors); computedScatter = Scatter(factors);