Fixed warnings
parent
e4f74354ca
commit
bcaa1d00bf
4
gtsam.h
4
gtsam.h
|
|
@ -1090,13 +1090,13 @@ class LevenbergMarquardtParams {
|
|||
LevenbergMarquardtParams();
|
||||
void print(string s) const;
|
||||
|
||||
double getMaxIterations() const;
|
||||
size_t getMaxIterations() const;
|
||||
double getRelativeErrorTol() const;
|
||||
double getAbsoluteErrorTol() const;
|
||||
double getErrorTol() const;
|
||||
string getVerbosity() const;
|
||||
|
||||
void setMaxIterations(double value);
|
||||
void setMaxIterations(size_t value);
|
||||
void setRelativeErrorTol(double value);
|
||||
void setAbsoluteErrorTol(double value);
|
||||
void setErrorTol(double value);
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@ namespace gtsam {
|
|||
maps_.reserve(maps_.size() + dimensions.size());
|
||||
BOOST_FOREACH(size_t dim, dimensions) {
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -45,23 +45,23 @@ public:
|
|||
Verbosity verbosity; ///< The printing verbosity during optimization (default SILENT)
|
||||
|
||||
NonlinearOptimizerParams() :
|
||||
maxIterations(100.0), relativeErrorTol(1e-5), absoluteErrorTol(1e-5),
|
||||
maxIterations(100), relativeErrorTol(1e-5), absoluteErrorTol(1e-5),
|
||||
errorTol(0.0), verbosity(SILENT) {}
|
||||
|
||||
virtual ~NonlinearOptimizerParams() {}
|
||||
virtual void print(const std::string& str = "") const ;
|
||||
|
||||
inline double getMaxIterations() const { return maxIterations; }
|
||||
inline double getRelativeErrorTol() const { return relativeErrorTol; }
|
||||
inline double getAbsoluteErrorTol() const { return absoluteErrorTol; }
|
||||
inline double getErrorTol() const { return errorTol; }
|
||||
inline std::string getVerbosity() const { return verbosityTranslator(verbosity); }
|
||||
size_t getMaxIterations() const { return maxIterations; }
|
||||
double getRelativeErrorTol() const { return relativeErrorTol; }
|
||||
double getAbsoluteErrorTol() const { return absoluteErrorTol; }
|
||||
double getErrorTol() const { return errorTol; }
|
||||
std::string getVerbosity() const { return verbosityTranslator(verbosity); }
|
||||
|
||||
inline void setMaxIterations(double value) { maxIterations = value; }
|
||||
inline void setRelativeErrorTol(double value) { relativeErrorTol = value; }
|
||||
inline void setAbsoluteErrorTol(double value) { absoluteErrorTol = value; }
|
||||
inline void setErrorTol(double value) { errorTol = value ; }
|
||||
inline void setVerbosity(const std::string &src) { verbosity = verbosityTranslator(src); }
|
||||
void setMaxIterations(size_t value) { maxIterations = value; }
|
||||
void setRelativeErrorTol(double value) { relativeErrorTol = value; }
|
||||
void setAbsoluteErrorTol(double value) { absoluteErrorTol = value; }
|
||||
void setErrorTol(double value) { errorTol = value ; }
|
||||
void setVerbosity(const std::string &src) { verbosity = verbosityTranslator(src); }
|
||||
|
||||
Verbosity verbosityTranslator(const std::string &s) const;
|
||||
std::string verbosityTranslator(Verbosity value) const;
|
||||
|
|
|
|||
|
|
@ -155,7 +155,7 @@ public:
|
|||
iterator end() { return order_.end(); }
|
||||
|
||||
/// 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
|
||||
std::pair<iterator,bool> tryInsert(Key key, Index order) { return tryInsert(std::make_pair(key,order)); }
|
||||
|
|
|
|||
Loading…
Reference in New Issue