diff --git a/gtsam/linear/IterativeOptimizationParameters.h b/gtsam/linear/IterativeOptimizationParameters.h index cc9a648aa..e779b7519 100644 --- a/gtsam/linear/IterativeOptimizationParameters.h +++ b/gtsam/linear/IterativeOptimizationParameters.h @@ -38,7 +38,7 @@ public: public: IterativeOptimizationParameters() : - maxIterations_(100), reset_(101), epsilon_(1e-5), epsilon_abs_(1e-5), + maxIterations_(500), reset_(501), epsilon_(1e-3), epsilon_abs_(1e-3), verbosity_(SILENT), nReduce_(0), skeleton_spec_(), est_cond_(false) { } diff --git a/gtsam/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h index 7fbcfaa55..600c267ac 100644 --- a/gtsam/linear/IterativeSolver.h +++ b/gtsam/linear/IterativeSolver.h @@ -34,35 +34,23 @@ public: protected: - GaussianFactorGraph::shared_ptr graph_; - VariableIndex::shared_ptr variableIndex_; Parameters::shared_ptr parameters_ ; public: - IterativeSolver( - const GaussianFactorGraph::shared_ptr& factorGraph, - const VariableIndex::shared_ptr& variableIndex): - graph_(factorGraph), variableIndex_(variableIndex), - parameters_(new Parameters()) { } + IterativeSolver(): parameters_(new Parameters()) {} - IterativeSolver( - const GaussianFactorGraph::shared_ptr& factorGraph, - const VariableIndex::shared_ptr& variableIndex, - const Parameters::shared_ptr& parameters): - graph_(factorGraph), variableIndex_(variableIndex), parameters_(parameters) { } + IterativeSolver(const Parameters::shared_ptr& parameters) + : parameters_(parameters) {} - IterativeSolver(): - parameters_(new IterativeOptimizationParameters()) {} + IterativeSolver(const IterativeSolver &solver) + : parameters_(solver.parameters_) {} - IterativeSolver(const IterativeSolver &solver): - parameters_(solver.parameters_) {} + IterativeSolver(const Parameters ¶meters) + : parameters_(new Parameters(parameters)) {} - IterativeSolver(const IterativeOptimizationParameters ¶meters): - parameters_(new IterativeOptimizationParameters(parameters)) {} - - IterativeSolver(const sharedParameters parameters): - parameters_(parameters) {} + IterativeSolver(const sharedParameters parameters) + : parameters_(parameters) {} virtual ~IterativeSolver() {}