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

add an enum field

release/4.3a0
Yong-Dian Jian 2012-06-11 13:12:02 +00:00
parent f90ae6feca
commit aa490792ba
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtsam/linear/ConjugateGradientSolver.h
View File

@ -18,6 +18,7 @@ namespace gtsam {
/** /**
* parameters for the conjugate gradient method * parameters for the conjugate gradient method
*/ */
struct ConjugateGradientParameters : public IterativeOptimizationParameters { struct ConjugateGradientParameters : public IterativeOptimizationParameters {
typedef IterativeOptimizationParameters Base; typedef IterativeOptimizationParameters Base;
@ -45,7 +46,7 @@ struct ConjugateGradientParameters : public IterativeOptimizationParameters {
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) ConjugateGradientParameters(const ConjugateGradientParameters &p)
: minIterations_(p.minIterations_), maxIterations_(p.maxIterations_), reset_(p.reset_), : Base(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_) {} epsilon_rel_(p.epsilon_rel_), epsilon_abs_(p.epsilon_abs_), blas_kernel_(p.blas_kernel_) {}
/* general interface */ /* general interface */

2
gtsam/linear/IterativeSolver.h
View File

@ -24,7 +24,7 @@ namespace gtsam {
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, ERROR } verbosity_; enum Verbosity { SILENT = 0, COMPLEXITY, ERROR } verbosity_;
public: public: