12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix interface and parameters

release/4.3a0
Yong-Dian Jian 2012-02-03 23:21:30 +00:00
parent bc7293a0a7
commit f551edddc6
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/linear/IterativeOptimizationParameters.h
View File

@ -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) {
}

30
gtsam/linear/IterativeSolver.h
View File

@ -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 &parameters)
: parameters_(new Parameters(parameters)) {}
IterativeSolver(const IterativeOptimizationParameters &parameters):
parameters_(new IterativeOptimizationParameters(parameters)) {}
IterativeSolver(const sharedParameters parameters):
parameters_(parameters) {}
IterativeSolver(const sharedParameters parameters)
: parameters_(parameters) {}
virtual ~IterativeSolver() {}