From 7efd5cc3681816d0977ac6e59b054aaeed99cfca Mon Sep 17 00:00:00 2001 From: lcarlone Date: Mon, 21 Dec 2020 21:06:25 -0500 Subject: [PATCH] finally fixed the typedef --- gtsam/nonlinear/GncOptimizer.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gtsam/nonlinear/GncOptimizer.h b/gtsam/nonlinear/GncOptimizer.h index 730c1aa43..dd6c8d17d 100644 --- a/gtsam/nonlinear/GncOptimizer.h +++ b/gtsam/nonlinear/GncOptimizer.h @@ -36,8 +36,8 @@ namespace gtsam { template class GncParams { public: - //typedef BaseOptimizerParameters::OptimizerType GncOptimizerType; - typedef BaseOptimizerParameters::OptimizerType OptimizerType; + /** For each parameter, specify the corresponding optimizer: e.g., GaussNewtonParams -> GaussNewtonOptimizer */ + typedef typename BaseOptimizerParameters::OptimizerType OptimizerType; /** Verbosity levels */ enum VerbosityGNC { @@ -145,12 +145,8 @@ public: template class GncOptimizer { public: - // types etc -// typedef BaseOptimizerParameters::OptimizerType GncOptimizerType; - // typedef GncParameters::BaseOptimizerParameters::OptimizerType BaseOptimizer; // - //typedef BaseOptimizerParameters::OptimizerType BaseOptimizer; - //typedef GaussNewtonOptimizer BaseOptimizer; - typedef GncParameters::OptimizerType BaseOptimizer; + /** For each parameter, specify the corresponding optimizer: e.g., GaussNewtonParams -> GaussNewtonOptimizer */ + typedef typename GncParameters::OptimizerType BaseOptimizer; private: NonlinearFactorGraph nfg_;