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

properly deprecate additional methods to fully finish deprecation

release/4.3a0
Varun Agrawal 2021-11-11 14:24:15 -05:00
parent 57d7103a47
commit b82acc133b
4 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtsam/linear/GaussianFactorGraph.cpp
View File

@ -504,13 +504,6 @@ namespace gtsam {
return e; return e;
} }
/* ************************************************************************* */
/** \deprecated */
VectorValues GaussianFactorGraph::optimize(boost::none_t,
const Eliminate& function) const {
return optimize(function);
}
/* ************************************************************************* */ /* ************************************************************************* */
void GaussianFactorGraph::printErrors( void GaussianFactorGraph::printErrors(
const VectorValues& values, const std::string& str, const VectorValues& values, const std::string& str,

11
gtsam/linear/GaussianFactorGraph.h
View File

@ -395,9 +395,14 @@ namespace gtsam {
public: public:
/** \deprecated */ #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
VectorValues optimize(boost::none_t, /** \deprecated */
const Eliminate& function = EliminationTraitsType::DefaultEliminate) const; VectorValues optimize(boost::none_t,
const Eliminate& function =
EliminationTraitsType::DefaultEliminate) const {
return optimize(function);
}
#endif
}; };

2
gtsam/nonlinear/Marginals.h
View File

@ -131,6 +131,7 @@ protected:
void computeBayesTree(const Ordering& ordering); void computeBayesTree(const Ordering& ordering);
public: public:
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
/** \deprecated argument order changed due to removing boost::optional<Ordering> */ /** \deprecated argument order changed due to removing boost::optional<Ordering> */
Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization, Marginals(const NonlinearFactorGraph& graph, const Values& solution, Factorization factorization,
const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {} const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
@ -142,6 +143,7 @@ public:
/** \deprecated argument order changed due to removing boost::optional<Ordering> */ /** \deprecated argument order changed due to removing boost::optional<Ordering> */
Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization, Marginals(const GaussianFactorGraph& graph, const VectorValues& solution, Factorization factorization,
const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {} const Ordering& ordering) : Marginals(graph, solution, ordering, factorization) {}
#endif
}; };

2
gtsam/nonlinear/NonlinearFactorGraph.h
View File

@ -265,6 +265,7 @@ namespace gtsam {
public: public:
#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V41
/** \deprecated */ /** \deprecated */
boost::shared_ptr<HessianFactor> linearizeToHessianFactor( boost::shared_ptr<HessianFactor> linearizeToHessianFactor(
const Values& values, boost::none_t, const Dampen& dampen = nullptr) const const Values& values, boost::none_t, const Dampen& dampen = nullptr) const
@ -274,6 +275,7 @@ namespace gtsam {
Values updateCholesky(const Values& values, boost::none_t, Values updateCholesky(const Values& values, boost::none_t,
const Dampen& dampen = nullptr) const const Dampen& dampen = nullptr) const
{return updateCholesky(values, dampen);} {return updateCholesky(values, dampen);}
#endif
}; };