diff --git a/linear/GaussianMultifrontalSolver.cpp b/linear/GaussianMultifrontalSolver.cpp index ae0ffcc29..ea803463a 100644 --- a/linear/GaussianMultifrontalSolver.cpp +++ b/linear/GaussianMultifrontalSolver.cpp @@ -20,6 +20,10 @@ #include +#include + +namespace ublas = boost::numeric::ublas; + namespace gtsam { /* ************************************************************************* */ @@ -57,9 +61,9 @@ GaussianFactor::shared_ptr GaussianMultifrontalSolver::marginal(Index j) const { /* ************************************************************************* */ std::pair GaussianMultifrontalSolver::marginalStandard(Index j) const { - GaussianConditional::shared_ptr conditional = Base::marginal(j)->eliminateFirst(); - Matrix R = conditional->get_R(); - return make_pair(conditional->get_d(), inverse(prod(trans(R),R))); + GaussianConditional::shared_ptr conditional = Base::marginal(j)->eliminateFirst(); + Matrix R = conditional->get_R(); + return make_pair(conditional->get_d(), inverse(ublas::prod(ublas::trans(R), R))); } } diff --git a/linear/GaussianSequentialSolver.cpp b/linear/GaussianSequentialSolver.cpp index 2fca9ed27..0ef8151b1 100644 --- a/linear/GaussianSequentialSolver.cpp +++ b/linear/GaussianSequentialSolver.cpp @@ -20,6 +20,10 @@ #include +#include + +namespace ublas = boost::numeric::ublas; + namespace gtsam { /* ************************************************************************* */ @@ -73,9 +77,9 @@ GaussianFactor::shared_ptr GaussianSequentialSolver::marginal(Index j) const { } std::pair GaussianSequentialSolver::marginalStandard(Index j) const { - GaussianConditional::shared_ptr conditional = Base::marginal(j)->eliminateFirst(); - Matrix R = conditional->get_R(); - return make_pair(conditional->get_d(), inverse(prod(trans(R),R))); + GaussianConditional::shared_ptr conditional = Base::marginal(j)->eliminateFirst(); + Matrix R = conditional->get_R(); + return make_pair(conditional->get_d(), inverse(ublas::prod(ublas::trans(R), R))); }