diff --git a/gtsam.h b/gtsam.h index 86e2b961c..f7a8b08e4 100644 --- a/gtsam.h +++ b/gtsam.h @@ -1364,13 +1364,13 @@ virtual class ConjugateGradientParameters : gtsam::IterativeOptimizationParamete void setReset(size_t value); void setEpsilon_rel(double value); void setEpsilon_abs(double value); - void print(string s); + void print(); }; #include virtual class SubgraphSolverParameters : gtsam::ConjugateGradientParameters { SubgraphSolverParameters(); - void print(string s) const; + void print() const; }; class SubgraphSolver { diff --git a/gtsam/linear/ConjugateGradientSolver.h b/gtsam/linear/ConjugateGradientSolver.h index 1f01565ce..d1b3b2c7e 100644 --- a/gtsam/linear/ConjugateGradientSolver.h +++ b/gtsam/linear/ConjugateGradientSolver.h @@ -61,14 +61,14 @@ public: inline void setEpsilon_rel(double value) { epsilon_rel_ = value; } inline void setEpsilon_abs(double value) { epsilon_abs_ = value; } - virtual void print(const std::string &s="") const { + virtual void print() const { Base::print(); std::cout << "ConjugateGradientParameters" << std::endl - << "minIter: " << minIterations_ << std::endl - << "maxIter: " << maxIterations_ << std::endl - << "resetIter: " << reset_ << std::endl - << "eps_rel: " << epsilon_rel_ << std::endl - << "eps_abs: " << epsilon_abs_ << std::endl; + << "minIter: " << minIterations_ << std::endl + << "maxIter: " << maxIterations_ << std::endl + << "resetIter: " << reset_ << std::endl + << "eps_rel: " << epsilon_rel_ << std::endl + << "eps_abs: " << epsilon_abs_ << std::endl; } }; diff --git a/gtsam/linear/IterativeSolver.h b/gtsam/linear/IterativeSolver.h index fb948bf69..81c989840 100644 --- a/gtsam/linear/IterativeSolver.h +++ b/gtsam/linear/IterativeSolver.h @@ -48,11 +48,10 @@ namespace gtsam { void setKernel(const std::string &s) ; void setVerbosity(const std::string &s) ; - void print() const { + virtual void print() const { std::cout << "IterativeOptimizationParameters" << std::endl - << "kernel: " << kernelTranslator(kernel_) << std::endl - << "verbosity: " << verbosityTranslator(verbosity_) << std::endl - << std::endl; + << "kernel: " << kernelTranslator(kernel_) << std::endl + << "verbosity: " << verbosityTranslator(verbosity_) << std::endl; } static Kernel kernelTranslator(const std::string &s); diff --git a/gtsam/linear/SubgraphSolver.h b/gtsam/linear/SubgraphSolver.h index 4df74aa16..889a82862 100644 --- a/gtsam/linear/SubgraphSolver.h +++ b/gtsam/linear/SubgraphSolver.h @@ -23,7 +23,7 @@ class SubgraphSolverParameters : public ConjugateGradientParameters { public: typedef ConjugateGradientParameters Base; SubgraphSolverParameters() : Base() {} - virtual void print(const std::string &s="") const { Base::print(s); } + virtual void print() const { Base::print(); } }; /**