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

make verbosityTranslator public static functions

release/4.3a0
Yong-Dian Jian 2014-06-29 13:08:17 -04:00
parent b698e30acb
commit 1a9ab972a9
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp
View File

@ -37,7 +37,7 @@ using boost::adaptors::map_values;
/* ************************************************************************* */ /* ************************************************************************* */
LevenbergMarquardtParams::VerbosityLM LevenbergMarquardtParams::verbosityLMTranslator( LevenbergMarquardtParams::VerbosityLM LevenbergMarquardtParams::verbosityLMTranslator(
const std::string &src) const { const std::string &src) {
std::string s = src; std::string s = src;
boost::algorithm::to_upper(s); boost::algorithm::to_upper(s);
if (s == "SILENT") if (s == "SILENT")
@ -59,7 +59,7 @@ LevenbergMarquardtParams::VerbosityLM LevenbergMarquardtParams::verbosityLMTrans
/* ************************************************************************* */ /* ************************************************************************* */
std::string LevenbergMarquardtParams::verbosityLMTranslator( std::string LevenbergMarquardtParams::verbosityLMTranslator(
VerbosityLM value) const { VerbosityLM value) {
std::string s; std::string s;
switch (value) { switch (value) {
case LevenbergMarquardtParams::SILENT: case LevenbergMarquardtParams::SILENT:

5
gtsam/nonlinear/LevenbergMarquardtOptimizer.h
View File

@ -41,9 +41,8 @@ public:
SILENT = 0, TERMINATION, LAMBDA, TRYLAMBDA, TRYCONFIG, DAMPED, TRYDELTA SILENT = 0, TERMINATION, LAMBDA, TRYLAMBDA, TRYCONFIG, DAMPED, TRYDELTA
}; };
private: static VerbosityLM verbosityLMTranslator(const std::string &s);
VerbosityLM verbosityLMTranslator(const std::string &s) const; static std::string verbosityLMTranslator(VerbosityLM value);
std::string verbosityLMTranslator(VerbosityLM value) const;
public: public:

4
gtsam/nonlinear/NonlinearOptimizerParams.cpp
View File

@ -14,7 +14,7 @@ namespace gtsam {
/* ************************************************************************* */ /* ************************************************************************* */
NonlinearOptimizerParams::Verbosity NonlinearOptimizerParams::verbosityTranslator( NonlinearOptimizerParams::Verbosity NonlinearOptimizerParams::verbosityTranslator(
const std::string &src) const { const std::string &src) {
std::string s = src; std::string s = src;
boost::algorithm::to_upper(s); boost::algorithm::to_upper(s);
if (s == "SILENT") if (s == "SILENT")
@ -36,7 +36,7 @@ NonlinearOptimizerParams::Verbosity NonlinearOptimizerParams::verbosityTranslato
/* ************************************************************************* */ /* ************************************************************************* */
std::string NonlinearOptimizerParams::verbosityTranslator( std::string NonlinearOptimizerParams::verbosityTranslator(
Verbosity value) const { Verbosity value) {
std::string s; std::string s;
switch (value) { switch (value) {
case NonlinearOptimizerParams::SILENT: case NonlinearOptimizerParams::SILENT:

5
gtsam/nonlinear/NonlinearOptimizerParams.h
View File

@ -84,9 +84,8 @@ public:
verbosity = verbosityTranslator(src); verbosity = verbosityTranslator(src);
} }
private: static Verbosity verbosityTranslator(const std::string &s) ;
Verbosity verbosityTranslator(const std::string &s) const; static std::string verbosityTranslator(Verbosity value) ;
std::string verbosityTranslator(Verbosity value) const;
// Successive Linearization Parameters // Successive Linearization Parameters