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

fix matlab toolbox compilation error

release/4.3a0
Yong-Dian Jian 2014-06-17 13:47:43 -04:00
parent 78fcfdc5ef
commit 0a7fd40b6c
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam.h
View File

@ -1514,7 +1514,7 @@ virtual class SubgraphSolverParameters : gtsam::ConjugateGradientParameters {
void print() const; void print() const;
}; };
class SubgraphSolver { virtual class SubgraphSolver {
SubgraphSolver(const gtsam::GaussianFactorGraph &A, const gtsam::SubgraphSolverParameters &parameters, const gtsam::Ordering& ordering); SubgraphSolver(const gtsam::GaussianFactorGraph &A, const gtsam::SubgraphSolverParameters &parameters, const gtsam::Ordering& ordering);
SubgraphSolver(const gtsam::GaussianFactorGraph &Ab1, const gtsam::GaussianFactorGraph &Ab2, const gtsam::SubgraphSolverParameters &parameters, const gtsam::Ordering& ordering); SubgraphSolver(const gtsam::GaussianFactorGraph &Ab1, const gtsam::GaussianFactorGraph &Ab2, const gtsam::SubgraphSolverParameters &parameters, const gtsam::Ordering& ordering);
gtsam::VectorValues optimize() const; gtsam::VectorValues optimize() const;
@ -1853,7 +1853,7 @@ virtual class NonlinearOptimizerParams {
void setLinearSolverType(string solver); void setLinearSolverType(string solver);
void setOrdering(const gtsam::Ordering& ordering); void setOrdering(const gtsam::Ordering& ordering);
void setIterativeParams(const gtsam::SubgraphSolverParameters &params); void setIterativeParams(gtsam::IterativeOptimizationParameters* params);
bool isMultifrontal() const; bool isMultifrontal() const;
bool isSequential() const; bool isSequential() const;

2
gtsam/linear/ConjugateGradientSolver.h
View File

@ -71,6 +71,8 @@ public:
inline void setEpsilon_rel(double value) { epsilon_rel_ = value; } inline void setEpsilon_rel(double value) { epsilon_rel_ = value; }
inline void setEpsilon_abs(double value) { epsilon_abs_ = value; } inline void setEpsilon_abs(double value) { epsilon_abs_ = value; }
void print() const { Base::print(); }
virtual void print(std::ostream &os) const; virtual void print(std::ostream &os) const;
static std::string blasTranslator(const BLASKernel k) ; static std::string blasTranslator(const BLASKernel k) ;

1
gtsam/linear/SubgraphSolver.h
View File

@ -28,6 +28,7 @@ class GTSAM_EXPORT SubgraphSolverParameters : public ConjugateGradientParameters
public: public:
typedef ConjugateGradientParameters Base; typedef ConjugateGradientParameters Base;
SubgraphSolverParameters() : Base() {} SubgraphSolverParameters() : Base() {}
void print() const { Base::print(); }
virtual void print(std::ostream &os) const { Base::print(os); } virtual void print(std::ostream &os) const { Base::print(os); }
}; };

4
gtsam/nonlinear/NonlinearOptimizerParams.cpp
View File

@ -66,8 +66,8 @@ std::string NonlinearOptimizerParams::verbosityTranslator(
/* ************************************************************************* */ /* ************************************************************************* */
void NonlinearOptimizerParams::setIterativeParams( void NonlinearOptimizerParams::setIterativeParams(
const SubgraphSolverParameters &params) { const boost::shared_ptr<IterativeOptimizationParameters> params) {
iterativeParams = boost::make_shared<SubgraphSolverParameters>(params); iterativeParams = params;
} }
/* ************************************************************************* */ /* ************************************************************************* */

4
gtsam/nonlinear/NonlinearOptimizerParams.h
View File

@ -148,7 +148,9 @@ public:
void setLinearSolverType(const std::string& solver) { void setLinearSolverType(const std::string& solver) {
linearSolverType = linearSolverTranslator(solver); linearSolverType = linearSolverTranslator(solver);
} }
void setIterativeParams(const SubgraphSolverParameters& params);
void setIterativeParams(const boost::shared_ptr<IterativeOptimizationParameters> params);
void setOrdering(const Ordering& ordering) { void setOrdering(const Ordering& ordering) {
this->ordering = ordering; this->ordering = ordering;
} }