Add docs, fix ctor placement
parent
c5576c534f
commit
91d275c9c7
|
|
@ -33,8 +33,6 @@ namespace gtsam {
|
|||
*/
|
||||
class GTSAM_EXPORT NonlinearOptimizerParams {
|
||||
public:
|
||||
NonlinearOptimizerParams() = default;
|
||||
|
||||
/** See NonlinearOptimizerParams::verbosity */
|
||||
enum Verbosity {
|
||||
SILENT, TERMINATION, ERROR, VALUES, DELTA, LINEAR
|
||||
|
|
@ -47,10 +45,6 @@ public:
|
|||
Verbosity verbosity = SILENT; ///< The printing verbosity during optimization (default SILENT)
|
||||
Ordering::OrderingType orderingType = Ordering::COLAMD; ///< The method of ordering use during variable elimination (default COLAMD)
|
||||
|
||||
virtual ~NonlinearOptimizerParams() {
|
||||
}
|
||||
virtual void print(const std::string& str = "") const;
|
||||
|
||||
size_t getMaxIterations() const { return maxIterations; }
|
||||
double getRelativeErrorTol() const { return relativeErrorTol; }
|
||||
double getAbsoluteErrorTol() const { return absoluteErrorTol; }
|
||||
|
|
@ -68,13 +62,33 @@ public:
|
|||
static Verbosity verbosityTranslator(const std::string &s) ;
|
||||
static std::string verbosityTranslator(Verbosity value) ;
|
||||
|
||||
/** Type for an optional user-provided hook to be called after each
|
||||
* internal optimizer iteration */
|
||||
/** Type for an optional user-provided hook to be called after each
|
||||
* internal optimizer iteration. See iterationHook below. */
|
||||
using IterationHook = std::function<
|
||||
void(size_t /*iteration*/, double/*errorBefore*/, double/*errorAfter*/)>;
|
||||
|
||||
/** Optional user-provided iteration hook to be called after each
|
||||
* optimization iteration (Default: empty) */
|
||||
/** Optional user-provided iteration hook to be called after each
|
||||
* optimization iteration (Default: none).
|
||||
* Note that `IterationHook` is defined as a std::function<> with this
|
||||
* signature:
|
||||
* \code
|
||||
* void(size_t iteration, double errorBefore, double errorAfter)
|
||||
* \endcode
|
||||
* which allows binding by means of a reference to a regular function:
|
||||
* \code
|
||||
* void foo(size_t iteration, double errorBefore, double errorAfter);
|
||||
* // ...
|
||||
* lmOpts.iterationHook = &foo;
|
||||
* \endcode
|
||||
* or to a C++11 lambda:
|
||||
* \code
|
||||
* lmOpts.iterationHook = [&](size_t iter, double oldError, double newError)
|
||||
* {
|
||||
* // ...
|
||||
* };
|
||||
* \endcode
|
||||
* or to the result of a properly-formed `std::bind` call.
|
||||
*/
|
||||
IterationHook iterationHook;
|
||||
|
||||
/** See NonlinearOptimizerParams::linearSolverType */
|
||||
|
|
@ -91,6 +105,12 @@ public:
|
|||
boost::optional<Ordering> ordering; ///< The optional variable elimination ordering, or empty to use COLAMD (default: empty)
|
||||
IterativeOptimizationParameters::shared_ptr iterativeParams; ///< The container for iterativeOptimization parameters. used in CG Solvers.
|
||||
|
||||
NonlinearOptimizerParams() = default;
|
||||
virtual ~NonlinearOptimizerParams() {
|
||||
}
|
||||
|
||||
virtual void print(const std::string& str = "") const;
|
||||
|
||||
inline bool isMultifrontal() const {
|
||||
return (linearSolverType == MULTIFRONTAL_CHOLESKY)
|
||||
|| (linearSolverType == MULTIFRONTAL_QR);
|
||||
|
|
|
|||
Loading…
Reference in New Issue