diff --git a/gtsam/linear/ConjugateGradientSolver.h b/gtsam/linear/ConjugateGradientSolver.h index f7f1ad5dc..c31507f9b 100644 --- a/gtsam/linear/ConjugateGradientSolver.h +++ b/gtsam/linear/ConjugateGradientSolver.h @@ -37,14 +37,17 @@ struct ConjugateGradientParameters : public IterativeOptimizationParameters { } blas_kernel_; ConjugateGradientParameters() - : minIterations_(1), maxIterations_(500), reset_(501), epsilon_rel_(1e-3), epsilon_abs_(1e-3), - blas_kernel_(GTSAM) {} + : minIterations_(1), maxIterations_(500), reset_(501), epsilon_rel_(1e-3), epsilon_abs_(1e-3), blas_kernel_(GTSAM) {} ConjugateGradientParameters(size_t minIterations, size_t maxIterations, size_t reset, double epsilon_rel, double epsilon_abs, BLASKernel blas = GTSAM) : minIterations_(minIterations), maxIterations_(maxIterations), reset_(reset), 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 */ inline size_t minIterations() const { return minIterations_; } inline size_t maxIterations() const { return maxIterations_; } diff --git a/gtsam/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h index fb19e6d58..6f002bda4 100644 --- a/gtsam/linear/IterativeSolver.h +++ b/gtsam/linear/IterativeSolver.h @@ -23,15 +23,15 @@ namespace gtsam { public: typedef boost::shared_ptr shared_ptr; - enum Kernel { CG = 0 } kernel_ ; ///< Iterative Method Kernel - enum Verbosity { SILENT = 0, COMPLEXITY = 1, ERROR = 2} verbosity_ ; ///< Verbosity + enum Kernel { CG = 0 } kernel_ ; ///< Iterative Method Kernel + enum Verbosity { SILENT, ERROR } verbosity_; public: IterativeOptimizationParameters(const IterativeOptimizationParameters &p) : 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) {} virtual ~IterativeOptimizationParameters() {}