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

make the print message with consistent format

release/4.3a0
Yong-Dian Jian 2013-01-03 02:50:55 +00:00
parent 9ce9231e14
commit 392ca3a84d
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtsam.h
View File

@ -1364,13 +1364,13 @@ virtual class ConjugateGradientParameters : gtsam::IterativeOptimizationParamete
void setReset(size_t value); void setReset(size_t value);
void setEpsilon_rel(double value); void setEpsilon_rel(double value);
void setEpsilon_abs(double value); void setEpsilon_abs(double value);
void print(string s); void print();
}; };
#include <gtsam/linear/SubgraphSolver.h> #include <gtsam/linear/SubgraphSolver.h>
virtual class SubgraphSolverParameters : gtsam::ConjugateGradientParameters { virtual class SubgraphSolverParameters : gtsam::ConjugateGradientParameters {
SubgraphSolverParameters(); SubgraphSolverParameters();
void print(string s) const; void print() const;
}; };
class SubgraphSolver { class SubgraphSolver {

12
gtsam/linear/ConjugateGradientSolver.h
View File

@ -61,14 +61,14 @@ public:
inline void setEpsilon_rel(double value) { epsilon_rel_ = value; } inline void setEpsilon_rel(double value) { epsilon_rel_ = value; }
inline void setEpsilon_abs(double value) { epsilon_abs_ = value; } inline void setEpsilon_abs(double value) { epsilon_abs_ = value; }
virtual void print(const std::string &s="") const { virtual void print() const {
Base::print(); Base::print();
std::cout << "ConjugateGradientParameters" << std::endl std::cout << "ConjugateGradientParameters" << std::endl
<< "minIter: " << minIterations_ << std::endl << "minIter: " << minIterations_ << std::endl
<< "maxIter: " << maxIterations_ << std::endl << "maxIter: " << maxIterations_ << std::endl
<< "resetIter: " << reset_ << std::endl << "resetIter: " << reset_ << std::endl
<< "eps_rel: " << epsilon_rel_ << std::endl << "eps_rel: " << epsilon_rel_ << std::endl
<< "eps_abs: " << epsilon_abs_ << std::endl; << "eps_abs: " << epsilon_abs_ << std::endl;
} }
}; };

7
gtsam/linear/IterativeSolver.h
View File

@ -48,11 +48,10 @@ namespace gtsam {
void setKernel(const std::string &s) ; void setKernel(const std::string &s) ;
void setVerbosity(const std::string &s) ; void setVerbosity(const std::string &s) ;
void print() const { virtual void print() const {
std::cout << "IterativeOptimizationParameters" << std::endl std::cout << "IterativeOptimizationParameters" << std::endl
<< "kernel: " << kernelTranslator(kernel_) << std::endl << "kernel: " << kernelTranslator(kernel_) << std::endl
<< "verbosity: " << verbosityTranslator(verbosity_) << std::endl << "verbosity: " << verbosityTranslator(verbosity_) << std::endl;
<< std::endl;
} }
static Kernel kernelTranslator(const std::string &s); static Kernel kernelTranslator(const std::string &s);

2
gtsam/linear/SubgraphSolver.h
View File

@ -23,7 +23,7 @@ class SubgraphSolverParameters : public ConjugateGradientParameters {
public: public:
typedef ConjugateGradientParameters Base; typedef ConjugateGradientParameters Base;
SubgraphSolverParameters() : Base() {} SubgraphSolverParameters() : Base() {}
virtual void print(const std::string &s="") const { Base::print(s); } virtual void print() const { Base::print(); }
}; };
/** /**