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

Moved wrapper functions to header file to clean up code

release/4.3a0
Richard Roberts 2012-10-28 06:21:15 +00:00
parent c251487baf
commit 600fcd027d
2 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtsam/linear/GaussianFactorGraph.cpp
View File

@ -47,27 +47,6 @@ namespace gtsam {
return keys;
}
/* ************************************************************************* */
std::pair<GaussianFactorGraph::sharedConditional, GaussianFactorGraph>
GaussianFactorGraph::eliminateFrontals(size_t nFrontals) const
{
return FactorGraph<GaussianFactor>::eliminateFrontals(nFrontals, EliminateQR);
}
/* ************************************************************************* */
std::pair<GaussianFactorGraph::sharedConditional, GaussianFactorGraph>
GaussianFactorGraph::eliminate(const std::vector<Index>& variables)
{
return FactorGraph<GaussianFactor>::eliminate(variables, EliminateQR);
}
/* ************************************************************************* */
std::pair<GaussianFactorGraph::sharedConditional, GaussianFactorGraph>
GaussianFactorGraph::eliminateOne(Index variable)
{
return FactorGraph<GaussianFactor>::eliminateOne(variable, EliminateQR);
}
/* ************************************************************************* */
void GaussianFactorGraph::permuteWithInverse(
const Permutation& inversePermutation) {

9
gtsam/linear/GaussianFactorGraph.h
View File

@ -122,7 +122,8 @@ namespace gtsam {
* FactorGraph<GaussianFactor>::eliminateFrontals with EliminateQR as the
* eliminate function argument.
*/
std::pair<sharedConditional, GaussianFactorGraph> eliminateFrontals(size_t nFrontals) const;
std::pair<sharedConditional, GaussianFactorGraph> eliminateFrontals(size_t nFrontals, const Eliminate& function) const {
return Base::eliminateFrontals(nFrontals, function); }
/** Factor the factor graph into a conditional and a remaining factor graph.
* Given the factor graph \f$ f(X) \f$, and \c variables to factorize out
@ -140,10 +141,12 @@ namespace gtsam {
* FactorGraph<GaussianFactor>::eliminate with EliminateQR as the eliminate
* function argument.
*/
std::pair<sharedConditional, GaussianFactorGraph> eliminate(const std::vector<Index>& variables);
std::pair<sharedConditional, GaussianFactorGraph> eliminate(const std::vector<Index>& variables, const Eliminate& function) {
return Base::eliminate(variables, function); }
/** Eliminate a single variable, by calling GaussianFactorGraph::eliminate. */
std::pair<sharedConditional, GaussianFactorGraph> eliminateOne(Index variable);
std::pair<sharedConditional, GaussianFactorGraph> eliminateOne(Index variable, const Eliminate& function) {
return Base::eliminateOne(variable, function); }
/** Permute the variables in the factors */
void permuteWithInverse(const Permutation& inversePermutation);