Fixed some compile errors related to rename
parent
ad2fb1166b
commit
fccdc46180
|
@ -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<SubgraphSolverParameters>();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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 );
|
||||
|
|
Loading…
Reference in New Issue