add an enum field

borglab · Jun 11, 2012 · aa49079 · aa49079
1 parent f90ae6f
commit aa49079
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -24,7 +24,7 @@ namespace gtsam {
 
     typedef boost::shared_ptr<IterativeOptimizationParameters> shared_ptr;
     enum Kernel { CG = 0 } kernel_ ;                                          ///< Iterative Method Kernel
-    enum Verbosity { SILENT, ERROR } verbosity_;
+    enum Verbosity { SILENT = 0, COMPLEXITY, ERROR } verbosity_;
 
   public: