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

remove templates

release/4.3a0
Varun Agrawal 2024-10-15 12:29:07 -04:00
parent ba6e2b8d7f
commit 1de138678f
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtsam/nonlinear/NonlinearConjugateGradientOptimizer.cpp
View File

@ -65,7 +65,7 @@ Values NonlinearConjugateGradientOptimizer::advance(
} }
GaussianFactorGraph::shared_ptr NonlinearConjugateGradientOptimizer::iterate() { GaussianFactorGraph::shared_ptr NonlinearConjugateGradientOptimizer::iterate() {
const auto [newValues, dummy] = nonlinearConjugateGradient<Values>( const auto [newValues, dummy] = nonlinearConjugateGradient(
state_->values, params_, true /* single iteration */); state_->values, params_, true /* single iteration */);
state_.reset( state_.reset(
new State(newValues, graph_.error(newValues), state_->iterations + 1)); new State(newValues, graph_.error(newValues), state_->iterations + 1));

26
gtsam/nonlinear/NonlinearConjugateGradientOptimizer.h
View File

@ -65,8 +65,7 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
const Values &optimize() override; const Values &optimize() override;
/** Implement the golden-section line search algorithm */ /** Implement the golden-section line search algorithm */
template <class V, class W> double lineSearch(const Values &currentValues, const VectorValues &gradient) const {
double lineSearch(const V currentValues, const W &gradient) {
/* normalize it such that it becomes a unit vector */ /* normalize it such that it becomes a unit vector */
const double g = gradient.norm(); const double g = gradient.norm();
@ -78,7 +77,7 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
double minStep = -1.0 / g, maxStep = 0, double minStep = -1.0 / g, maxStep = 0,
newStep = minStep + (maxStep - minStep) / (phi + 1.0); newStep = minStep + (maxStep - minStep) / (phi + 1.0);
V newValues = advance(currentValues, newStep, gradient); Values newValues = advance(currentValues, newStep, gradient);
double newError = error(newValues); double newError = error(newValues);
while (true) { while (true) {
@ -91,7 +90,7 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
return 0.5 * (minStep + maxStep); return 0.5 * (minStep + maxStep);
} }
const V testValues = advance(currentValues, testStep, gradient); const Values testValues = advance(currentValues, testStep, gradient);
const double testError = error(testValues); const double testError = error(testValues);
// update the working range // update the working range
@ -120,18 +119,12 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
* formula suggested in * formula suggested in
* http://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient_method. * http://en.wikipedia.org/wiki/Nonlinear_conjugate_gradient_method.
* *
* The V class
* denotes the state or the solution.
*
* The last parameter is a switch between gradient-descent and conjugate * The last parameter is a switch between gradient-descent and conjugate
* gradient * gradient
*/ */
template <class V> std::tuple<Values, int> nonlinearConjugateGradient(
std::tuple<V, int> nonlinearConjugateGradient( const Values &initial, const NonlinearOptimizerParams &params,
const V &initial, const NonlinearOptimizerParams &params, const bool singleIteration, const bool gradientDescent = false) const {
const bool singleIteration, const bool gradientDescent = false) {
// GTSAM_CONCEPT_MANIFOLD_TYPE(V)
size_t iteration = 0; size_t iteration = 0;
// check if we're already close enough // check if we're already close enough
@ -144,12 +137,12 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
return {initial, iteration}; return {initial, iteration};
} }
V currentValues = initial; Values currentValues = initial;
VectorValues currentGradient = gradient(currentValues), prevGradient, VectorValues currentGradient = gradient(currentValues), prevGradient,
direction = currentGradient; direction = currentGradient;
/* do one step of gradient descent */ /* do one step of gradient descent */
V prevValues = currentValues; Values prevValues = currentValues;
double prevError = currentError; double prevError = currentError;
double alpha = lineSearch(currentValues, direction); double alpha = lineSearch(currentValues, direction);
currentValues = advance(prevValues, alpha, direction); currentValues = advance(prevValues, alpha, direction);
@ -205,5 +198,4 @@ class GTSAM_EXPORT NonlinearConjugateGradientOptimizer
} }
}; };
} // \ namespace gtsam } // namespace gtsam