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

Fixed warnings

release/4.3a0
Richard Roberts 2012-07-13 21:57:57 +00:00
parent e4f74354ca
commit bcaa1d00bf
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam.h
View File

@ -1090,13 +1090,13 @@ class LevenbergMarquardtParams {
LevenbergMarquardtParams(); LevenbergMarquardtParams();
void print(string s) const; void print(string s) const;
double getMaxIterations() const; size_t getMaxIterations() const;
double getRelativeErrorTol() const; double getRelativeErrorTol() const;
double getAbsoluteErrorTol() const; double getAbsoluteErrorTol() const;
double getErrorTol() const; double getErrorTol() const;
string getVerbosity() const; string getVerbosity() const;
void setMaxIterations(double value); void setMaxIterations(size_t value);
void setRelativeErrorTol(double value); void setRelativeErrorTol(double value);
void setAbsoluteErrorTol(double value); void setAbsoluteErrorTol(double value);
void setErrorTol(double value); void setErrorTol(double value);

2
gtsam/linear/VectorValues.h
View File

@ -419,7 +419,7 @@ namespace gtsam {
maps_.reserve(maps_.size() + dimensions.size()); maps_.reserve(maps_.size() + dimensions.size());
BOOST_FOREACH(size_t dim, dimensions) { BOOST_FOREACH(size_t dim, dimensions) {
maps_.push_back(values_.segment(varStart, dim)); maps_.push_back(values_.segment(varStart, dim));
varStart += dim; // varStart is continued from first for loop varStart += (int)dim; // varStart is continued from first for loop
} }
} }

22
gtsam/nonlinear/NonlinearOptimizer.h
View File

@ -45,23 +45,23 @@ public:
Verbosity verbosity; ///< The printing verbosity during optimization (default SILENT) Verbosity verbosity; ///< The printing verbosity during optimization (default SILENT)
NonlinearOptimizerParams() : NonlinearOptimizerParams() :
maxIterations(100.0), relativeErrorTol(1e-5), absoluteErrorTol(1e-5), maxIterations(100), relativeErrorTol(1e-5), absoluteErrorTol(1e-5),
errorTol(0.0), verbosity(SILENT) {} errorTol(0.0), verbosity(SILENT) {}
virtual ~NonlinearOptimizerParams() {} virtual ~NonlinearOptimizerParams() {}
virtual void print(const std::string& str = "") const ; virtual void print(const std::string& str = "") const ;
inline double getMaxIterations() const { return maxIterations; } size_t getMaxIterations() const { return maxIterations; }
inline double getRelativeErrorTol() const { return relativeErrorTol; } double getRelativeErrorTol() const { return relativeErrorTol; }
inline double getAbsoluteErrorTol() const { return absoluteErrorTol; } double getAbsoluteErrorTol() const { return absoluteErrorTol; }
inline double getErrorTol() const { return errorTol; } double getErrorTol() const { return errorTol; }
inline std::string getVerbosity() const { return verbosityTranslator(verbosity); } std::string getVerbosity() const { return verbosityTranslator(verbosity); }
inline void setMaxIterations(double value) { maxIterations = value; } void setMaxIterations(size_t value) { maxIterations = value; }
inline void setRelativeErrorTol(double value) { relativeErrorTol = value; } void setRelativeErrorTol(double value) { relativeErrorTol = value; }
inline void setAbsoluteErrorTol(double value) { absoluteErrorTol = value; } void setAbsoluteErrorTol(double value) { absoluteErrorTol = value; }
inline void setErrorTol(double value) { errorTol = value ; } void setErrorTol(double value) { errorTol = value ; }
inline void setVerbosity(const std::string &src) { verbosity = verbosityTranslator(src); } void setVerbosity(const std::string &src) { verbosity = verbosityTranslator(src); }
Verbosity verbosityTranslator(const std::string &s) const; Verbosity verbosityTranslator(const std::string &s) const;
std::string verbosityTranslator(Verbosity value) const; std::string verbosityTranslator(Verbosity value) const;

2
gtsam/nonlinear/Ordering.h
View File

@ -155,7 +155,7 @@ public:
iterator end() { return order_.end(); } iterator end() { return order_.end(); }
/// Test if the key exists in the ordering. /// Test if the key exists in the ordering.
bool exists(Key key) const { return order_.count(key); } bool exists(Key key) const { return order_.count(key) > 0; }
///TODO: comment ///TODO: comment
std::pair<iterator,bool> tryInsert(Key key, Index order) { return tryInsert(std::make_pair(key,order)); } std::pair<iterator,bool> tryInsert(Key key, Index order) { return tryInsert(std::make_pair(key,order)); }