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

fix missing field

release/4.3a0
Yong-Dian Jian 2012-06-09 14:13:32 +00:00
parent 38ff9a466d
commit 774f2a4e39
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gtsam/linear/ConjugateGradientSolver.h
View File

@ -37,14 +37,17 @@ struct ConjugateGradientParameters : public IterativeOptimizationParameters {
} blas_kernel_; } blas_kernel_;
ConjugateGradientParameters() ConjugateGradientParameters()
: minIterations_(1), maxIterations_(500), reset_(501), epsilon_rel_(1e-3), epsilon_abs_(1e-3), : minIterations_(1), maxIterations_(500), reset_(501), epsilon_rel_(1e-3), epsilon_abs_(1e-3), blas_kernel_(GTSAM) {}
blas_kernel_(GTSAM) {}
ConjugateGradientParameters(size_t minIterations, size_t maxIterations, size_t reset, ConjugateGradientParameters(size_t minIterations, size_t maxIterations, size_t reset,
double epsilon_rel, double epsilon_abs, BLASKernel blas = GTSAM) double epsilon_rel, double epsilon_abs, BLASKernel blas = GTSAM)
: minIterations_(minIterations), maxIterations_(maxIterations), reset_(reset), : minIterations_(minIterations), maxIterations_(maxIterations), reset_(reset),
epsilon_rel_(epsilon_rel), epsilon_abs_(epsilon_abs), blas_kernel_(blas) {} epsilon_rel_(epsilon_rel), epsilon_abs_(epsilon_abs), blas_kernel_(blas) {}
ConjugateGradientParameters(const ConjugateGradientParameters &p)
: minIterations_(p.minIterations_), maxIterations_(p.maxIterations_), reset_(p.reset_),
epsilon_rel_(p.epsilon_rel_), epsilon_abs_(p.epsilon_abs_), blas_kernel_(p.blas_kernel_) {}
/* general interface */ /* general interface */
inline size_t minIterations() const { return minIterations_; } inline size_t minIterations() const { return minIterations_; }
inline size_t maxIterations() const { return maxIterations_; } inline size_t maxIterations() const { return maxIterations_; }

6
gtsam/linear/IterativeSolver.h
View File

@ -23,15 +23,15 @@ namespace gtsam {
public: public:
typedef boost::shared_ptr<IterativeOptimizationParameters> shared_ptr; typedef boost::shared_ptr<IterativeOptimizationParameters> shared_ptr;
enum Kernel { CG = 0 } kernel_ ; ///< Iterative Method Kernel enum Kernel { CG = 0 } kernel_ ; ///< Iterative Method Kernel
enum Verbosity { SILENT = 0, COMPLEXITY = 1, ERROR = 2} verbosity_ ; ///< Verbosity enum Verbosity { SILENT, ERROR } verbosity_;
public: public:
IterativeOptimizationParameters(const IterativeOptimizationParameters &p) IterativeOptimizationParameters(const IterativeOptimizationParameters &p)
: kernel_(p.kernel_), verbosity_(p.verbosity_) {} : kernel_(p.kernel_), verbosity_(p.verbosity_) {}
IterativeOptimizationParameters(Kernel kernel = CG, Verbosity verbosity = SILENT) IterativeOptimizationParameters(const Kernel kernel = CG, const Verbosity verbosity = SILENT)
: kernel_(kernel), verbosity_(verbosity) {} : kernel_(kernel), verbosity_(verbosity) {}
virtual ~IterativeOptimizationParameters() {} virtual ~IterativeOptimizationParameters() {}