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

Fixed some compile errors related to rename

release/4.3a0
Frank Dellaert 2013-10-25 19:16:15 +00:00
parent ad2fb1166b
commit fccdc46180
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/Pose2SLAMwSPCG.cpp
View File

@ -104,7 +104,7 @@ int main(int argc, char** argv) {
LevenbergMarquardtParams parameters; LevenbergMarquardtParams parameters;
parameters.verbosity = NonlinearOptimizerParams::ERROR; parameters.verbosity = NonlinearOptimizerParams::ERROR;
parameters.verbosityLM = LevenbergMarquardtParams::LAMBDA; parameters.verbosityLM = LevenbergMarquardtParams::LAMBDA;
parameters.linearSolverType = NonlinearSolverParams::CONJUGATE_GRADIENT; parameters.linearSolverType = NonlinearOptimizerParams::CONJUGATE_GRADIENT;
{ {
parameters.iterativeParams = boost::make_shared<SubgraphSolverParameters>(); parameters.iterativeParams = boost::make_shared<SubgraphSolverParameters>();

2
examples/SolverComparer.cpp
View File

@ -442,7 +442,7 @@ void runBatch()
gttic_(Create_optimizer); gttic_(Create_optimizer);
GaussNewtonParams params; GaussNewtonParams params;
params.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_CHOLESKY; params.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_CHOLESKY;
GaussNewtonOptimizer optimizer(measurements, initial, params); GaussNewtonOptimizer optimizer(measurements, initial, params);
gttoc_(Create_optimizer); gttoc_(Create_optimizer);
double lastError; double lastError;

2
gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp
View File

@ -58,7 +58,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int
// parameters.lambdaInitial = 1; // parameters.lambdaInitial = 1;
// parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosity = NonlinearOptimizerParams::ERROR;
// parameters.verbosityLM = ISAM2Params::DAMPED; // 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 // it is the same as the input graph, but we removed the empty factors that may be present in the input graph
NonlinearFactorGraph graphForISAM2; NonlinearFactorGraph graphForISAM2;

2
gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp
View File

@ -58,7 +58,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int
// parameters.lambdaInitial = 1; // parameters.lambdaInitial = 1;
// parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosity = NonlinearOptimizerParams::ERROR;
// parameters.verbosityLM = ISAM2Params::DAMPED; // parameters.verbosityLM = ISAM2Params::DAMPED;
// parameters.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_QR; // parameters.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_QR;
ISAM2 optimizer(parameters); ISAM2 optimizer(parameters);
optimizer.update( graph, theta ); optimizer.update( graph, theta );

2
gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp
View File

@ -57,7 +57,7 @@ Values BatchOptimize(const NonlinearFactorGraph& graph, const Values& theta, int
// parameters.lambdaInitial = 1; // parameters.lambdaInitial = 1;
// parameters.verbosity = NonlinearOptimizerParams::ERROR; // parameters.verbosity = NonlinearOptimizerParams::ERROR;
// parameters.verbosityLM = ISAM2Params::DAMPED; // parameters.verbosityLM = ISAM2Params::DAMPED;
// parameters.linearSolverType = NonlinearSolverParams::MULTIFRONTAL_QR; // parameters.linearSolverType = NonlinearOptimizerParams::MULTIFRONTAL_QR;
ISAM2 optimizer(parameters); ISAM2 optimizer(parameters);
optimizer.update( graph, theta ); optimizer.update( graph, theta );