remove Dogleg from GNC-supported base-optimizers, and use nested templates

release/4.3a0
John Lambert 2021-08-12 06:44:01 -04:00 committed by GitHub
parent c9bcb1430c
commit 9b05390ccb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions

View File

@ -523,7 +523,7 @@ virtual class DoglegParams : gtsam::NonlinearOptimizerParams {
};
#include <gtsam/nonlinear/GncParams.h>
template<PARAMS = {gtsam::DoglegParams, gtsam::GaussNewtonParams, gtsam::LevenbergMarquardtParams}>
template<PARAMS = {gtsam::GaussNewtonParams, gtsam::LevenbergMarquardtParams}>
class GncParams {
GncParams(const PARAMS& baseOptimizerParams);
GncParams();
@ -561,7 +561,8 @@ virtual class DoglegOptimizer : gtsam::NonlinearOptimizer {
};
#include <gtsam/nonlinear/GncOptimizer.h>
template<PARAMS = {gtsam::GncParameters}>
template<PARAMS = {gtsam::GncParams<gtsam::GaussNewtonParams>,
gtsam::GncParams<gtsam::LevenbergMarquardtParams>}>
class GncOptimizer {
GncOptimizer(const gtsam::NonlinearFactorGraph& graph,
const gtsam::Values& initialValues,