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

Standardized function names ('sequential' and 'multifrontal' instead of 'elimination' and 'multifrontal')

release/4.3a0
Richard Roberts 2010-10-22 23:01:21 +00:00
parent fda11d7c15
commit c13d909343
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nonlinear/NonlinearOptimization-inl.h
View File

@ -33,7 +33,7 @@ namespace gtsam {
* The Elimination solver * The Elimination solver
*/ */
template<class G, class T> template<class G, class T>
T optimizeElimination(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters) { T optimizeSequential(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters) {
// Use a variable ordering from COLAMD // Use a variable ordering from COLAMD
Ordering::shared_ptr ordering = graph.orderingCOLAMD(initialEstimate); Ordering::shared_ptr ordering = graph.orderingCOLAMD(initialEstimate);
@ -68,7 +68,7 @@ namespace gtsam {
} }
// /** // /**
// * The multifrontal solver // * The sparse preconditioned conjucate gradient solver
// */ // */
// template<class G, class T> // template<class G, class T>
// T optimizeSPCG(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters = NonlinearOptimizationParameters()) { // T optimizeSPCG(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters = NonlinearOptimizationParameters()) {
@ -93,8 +93,8 @@ namespace gtsam {
T optimize(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters, T optimize(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters,
const enum LinearSolver& solver) { const enum LinearSolver& solver) {
switch (solver) { switch (solver) {
case ELIMINATION: case SEQUENTIAL:
return optimizeElimination<G,T>(graph, initialEstimate, parameters); return optimizeSequential<G,T>(graph, initialEstimate, parameters);
case MULTIFRONTAL: case MULTIFRONTAL:
return optimizeMultiFrontal<G,T>(graph, initialEstimate, parameters); return optimizeMultiFrontal<G,T>(graph, initialEstimate, parameters);
case SPCG: case SPCG:

6
nonlinear/NonlinearOptimization.h
View File

@ -35,8 +35,8 @@ namespace gtsam {
* all the linear solver types * all the linear solver types
*/ */
enum LinearSolver{ enum LinearSolver{
ELIMINATION, // Elimination SEQUENTIAL, // Sequential elimination
MULTIFRONTAL, // Multi-frontal MULTIFRONTAL, // Multi-frontal elimination
SPCG, // Subgraph Preconditioned Conjugate Gradient SPCG, // Subgraph Preconditioned Conjugate Gradient
}; };
@ -46,7 +46,7 @@ namespace gtsam {
*/ */
template<class G, class T> template<class G, class T>
T optimize(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters = NonlinearOptimizationParameters(), T optimize(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters = NonlinearOptimizationParameters(),
const enum LinearSolver& solver = ELIMINATION); const enum LinearSolver& solver = SEQUENTIAL);
} }