From fccdc461808bb559cc0856ba1a18745ca1524a23 Mon Sep 17 00:00:00 2001 From: Frank Dellaert Date: Fri, 25 Oct 2013 19:16:15 +0000 Subject: [PATCH] Fixed some compile errors related to rename --- examples/Pose2SLAMwSPCG.cpp | 2 +- examples/SolverComparer.cpp | 2 +- .../nonlinear/tests/testConcurrentIncrementalFilter.cpp | 2 +- .../nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp | 2 +- .../nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/Pose2SLAMwSPCG.cpp b/examples/Pose2SLAMwSPCG.cpp index ec96063ee..32eb6f104 100644 --- a/examples/Pose2SLAMwSPCG.cpp +++ b/examples/Pose2SLAMwSPCG.cpp @@ -104,7 +104,7 @@ int main(int argc, char** argv) { LevenbergMarquardtParams parameters; parameters.verbosity = NonlinearOptimizerParams::ERROR; parameters.verbosityLM = LevenbergMarquardtParams::LAMBDA; - parameters.linearSolverType = NonlinearSolverParams::CONJUGATE_GRADIENT; + parameters.linearSolverType = NonlinearOptimizerParams::CONJUGATE_GRADIENT; { parameters.iterativeParams = boost::make_shared(); diff --git a/examples/SolverComparer.cpp b/examples/SolverComparer.cpp index 5fc08921f..e58c90e9f 100644 --- a/examples/SolverComparer.cpp +++ b/examples/SolverComparer.cpp @@ -442,7 +442,7 @@ void runBatch() gttic_(Create_optimizer); GaussNewtonParams params; - params.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_CHOLESKY; + params.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_CHOLESKY; GaussNewtonOptimizer optimizer(measurements, initial, params); gttoc_(Create_optimizer); double lastError; diff --git a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp index ae6c93ca0..f43332c1a 100644 --- a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp +++ b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp @@ -58,7 +58,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int // parameters.lambdaInitial = 1; // parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosityLM = ISAM2Params::DAMPED; -// parameters.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_QR; +// parameters.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_QR; // it is the same as the input graph, but we removed the empty factors that may be present in the input graph NonlinearFactorGraph graphForISAM2; diff --git a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp index d08618f47..b13667541 100644 --- a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp +++ b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp @@ -58,7 +58,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int // parameters.lambdaInitial = 1; // parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosityLM = ISAM2Params::DAMPED; -// parameters.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_QR; +// parameters.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_QR; ISAM2 optimizer(parameters); optimizer.update( graph, theta ); diff --git a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp index e485ef783..5b776fc95 100644 --- a/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp +++ b/gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp @@ -57,7 +57,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int // parameters.lambdaInitial = 1; // parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosityLM = ISAM2Params::DAMPED; -// parameters.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_QR; +// parameters.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_QR; ISAM2 optimizer(parameters); optimizer.update( graph, theta );