From aa490792babe9016dc9d3cc669ac3619d238260b Mon Sep 17 00:00:00 2001 From: Yong-Dian Jian Date: Mon, 11 Jun 2012 13:12:02 +0000 Subject: [PATCH] add an enum field --- gtsam/linear/ConjugateGradientSolver.h | 3 ++- gtsam/linear/IterativeSolver.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gtsam/linear/ConjugateGradientSolver.h b/gtsam/linear/ConjugateGradientSolver.h index c31507f9b..06b2aa178 100644 --- a/gtsam/linear/ConjugateGradientSolver.h +++ b/gtsam/linear/ConjugateGradientSolver.h @@ -18,6 +18,7 @@ namespace gtsam { /** * parameters for the conjugate gradient method */ + struct ConjugateGradientParameters : public IterativeOptimizationParameters { typedef IterativeOptimizationParameters Base; @@ -45,7 +46,7 @@ struct ConjugateGradientParameters : public IterativeOptimizationParameters { epsilon_rel_(epsilon_rel), epsilon_abs_(epsilon_abs), blas_kernel_(blas) {} 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_) {} /* general interface */ diff --git a/gtsam/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h index 6f002bda4..77146d1e4 100644 --- a/gtsam/linear/IterativeSolver.h +++ b/gtsam/linear/IterativeSolver.h @@ -24,7 +24,7 @@ namespace gtsam { typedef boost::shared_ptr shared_ptr; enum Kernel { CG = 0 } kernel_ ; ///< Iterative Method Kernel - enum Verbosity { SILENT, ERROR } verbosity_; + enum Verbosity { SILENT = 0, COMPLEXITY, ERROR } verbosity_; public: