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

fix ambiguous function overload and default threshold

release/4.3a0
Yong-Dian Jian 2010-10-25 23:18:55 +00:00
parent 3743342534
commit 0778f37063
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/nonlinear/NonlinearOptimizationParameters.h
View File

@ -47,7 +47,7 @@ namespace gtsam {
typedef boost::shared_ptr<NonlinearOptimizationParameters> sharedThis ;
NonlinearOptimizationParameters(): absDecrease_(1), relDecrease_(1e-3), sumError_(0.0),
NonlinearOptimizationParameters(): absDecrease_(1e-6), relDecrease_(1e-6), sumError_(0.0),
maxIterations_(100), lambda_(1e-5), lambdaFactor_(10.0), verbosity_(ERROR), lambdaMode_(BOUNDED){}
NonlinearOptimizationParameters(double absDecrease, double relDecrease, double sumError,

12
gtsam/nonlinear/NonlinearOptimizer.h
View File

@ -310,7 +310,7 @@ namespace gtsam {
static shared_values optimizeLM(shared_graph graph,
shared_values values,
Parameters::verbosityLevel verbosity = Parameters::SILENT)
Parameters::verbosityLevel verbosity)
{
Parameters def ;
shared_parameters parameters = def.newVerbosity_(verbosity);
@ -322,7 +322,7 @@ namespace gtsam {
static shared_values optimizeLM(const G& graph,
const T& values,
const Parameters parameters) {
const Parameters parameters = Parameters()) {
return optimizeLM(boost::make_shared<const G>(graph),
boost::make_shared<const T>(values),
boost::make_shared<Parameters>(parameters));
@ -330,7 +330,7 @@ namespace gtsam {
static shared_values optimizeLM(const G& graph,
const T& values,
Parameters::verbosityLevel verbosity = Parameters::SILENT) {
Parameters::verbosityLevel verbosity) {
return optimizeLM(boost::make_shared<const G>(graph),
boost::make_shared<const T>(values),
verbosity);
@ -347,7 +347,7 @@ namespace gtsam {
// suggested interface
static shared_values optimizeGN(shared_graph graph,
shared_values values,
shared_parameters parameters) {
shared_parameters parameters = boost::make_shared<Parameters>()) {
Ordering::shared_ptr ordering = graph->orderingCOLAMD(*values);
// initial optimization state is the same in both cases tested
@ -361,7 +361,7 @@ namespace gtsam {
// backward compatible
static shared_values optimizeGN(shared_graph graph,
shared_values values,
Parameters::verbosityLevel verbosity = Parameters::SILENT) {
Parameters::verbosityLevel verbosity) {
Parameters def ;
shared_parameters parameters = def.newVerbosity_(verbosity);
return optimizeGN(graph, values, parameters);
@ -379,7 +379,7 @@ namespace gtsam {
}
// backward compatible
static shared_values optimizeGN(const G& graph, const T& values, Parameters::verbosityLevel verbosity = Parameters::SILENT) {
static shared_values optimizeGN(const G& graph, const T& values, Parameters::verbosityLevel verbosity) {
return optimizeGN(boost::make_shared<const G>(graph),
boost::make_shared<const T>(values),
verbosity);