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

fix OrderingType declaration

release/4.3a0
Varun Agrawal 2021-11-10 18:22:54 -05:00
parent 5051f19f30
commit 57d7103a47
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtsam/nonlinear/Marginals.cpp
View File

@ -81,13 +81,14 @@ Marginals::Marginals(const GaussianFactorGraph& graph, const VectorValues& solut
/* ************************************************************************* */ /* ************************************************************************* */
void Marginals::computeBayesTree() { void Marginals::computeBayesTree() {
// The default ordering to use. // The default ordering to use.
const Ordering ordering = Ordering::COLAMND; const Ordering::OrderingType defaultOrderingType = Ordering::COLAMD;
// Compute BayesTree // Compute BayesTree
if (factorization_ == CHOLESKY) if (factorization_ == CHOLESKY)
bayesTree_ = bayesTree_ = *graph_.eliminateMultifrontal(defaultOrderingType,
*graph_.eliminateMultifrontal(ordering, EliminatePreferCholesky); EliminatePreferCholesky);
else if (factorization_ == QR) else if (factorization_ == QR)
bayesTree_ = *graph_.eliminateMultifrontal(ordering, EliminateQR); bayesTree_ =
*graph_.eliminateMultifrontal(defaultOrderingType, EliminateQR);
} }
/* ************************************************************************* */ /* ************************************************************************* */