diff --git a/nonlinear/NonlinearOptimization-inl.h b/nonlinear/NonlinearOptimization-inl.h index be1641874..677f4af61 100644 --- a/nonlinear/NonlinearOptimization-inl.h +++ b/nonlinear/NonlinearOptimization-inl.h @@ -33,7 +33,7 @@ namespace gtsam { * The Elimination solver */ template - 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 Ordering::shared_ptr ordering = graph.orderingCOLAMD(initialEstimate); @@ -68,7 +68,7 @@ namespace gtsam { } // /** -// * The multifrontal solver +// * The sparse preconditioned conjucate gradient solver // */ // template // 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, const enum LinearSolver& solver) { switch (solver) { - case ELIMINATION: - return optimizeElimination(graph, initialEstimate, parameters); + case SEQUENTIAL: + return optimizeSequential(graph, initialEstimate, parameters); case MULTIFRONTAL: return optimizeMultiFrontal(graph, initialEstimate, parameters); case SPCG: diff --git a/nonlinear/NonlinearOptimization.h b/nonlinear/NonlinearOptimization.h index f0cd9ae39..7c6c8c04b 100644 --- a/nonlinear/NonlinearOptimization.h +++ b/nonlinear/NonlinearOptimization.h @@ -35,8 +35,8 @@ namespace gtsam { * all the linear solver types */ enum LinearSolver{ - ELIMINATION, // Elimination - MULTIFRONTAL, // Multi-frontal + SEQUENTIAL, // Sequential elimination + MULTIFRONTAL, // Multi-frontal elimination SPCG, // Subgraph Preconditioned Conjugate Gradient }; @@ -46,7 +46,7 @@ namespace gtsam { */ template T optimize(const G& graph, const T& initialEstimate, const NonlinearOptimizationParameters& parameters = NonlinearOptimizationParameters(), - const enum LinearSolver& solver = ELIMINATION); + const enum LinearSolver& solver = SEQUENTIAL); }