saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 16:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace scoped_ptr with C++11's unique_ptr

Browse Source 
Change-Id: Ib5a504c491e3a79af52a95accf009df473470c6b
This commit is contained in:
Keir Mierle
2018-03-30 16:16:59 -07:00
parent fc9336e12a
commit 7c4e8a454e
120 changed files with 427 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/ceres/gradient_problem_solver.cc
+4 -4
View File
@@ -30,6 +30,7 @@
#include "ceres/gradient_problem_solver.h"
#include <memory>
#include "ceres/callbacks.h"
#include "ceres/gradient_problem.h"
#include "ceres/gradient_problem_evaluator.h"
@@ -103,7 +104,6 @@ void GradientProblemSolver::Solve(const GradientProblemSolver::Options& options,
using internal::GradientProblemSolverStateUpdatingCallback;
using internal::LoggingCallback;
using internal::Minimizer;
using internal::scoped_ptr;
using internal::SetSummaryFinalCost;
using internal::WallTimeInSeconds;
@@ -135,7 +135,7 @@ void GradientProblemSolver::Solve(const GradientProblemSolver::Options& options,
Minimizer::Options(GradientProblemSolverOptionsToSolverOptions(options));
minimizer_options.evaluator.reset(new GradientProblemEvaluator(problem));
scoped_ptr<IterationCallback> logging_callback;
std::unique_ptr<IterationCallback> logging_callback;
if (options.logging_type != SILENT) {
logging_callback.reset(
new LoggingCallback(LINE_SEARCH, options.minimizer_progress_to_stdout));
@@ -143,7 +143,7 @@ void GradientProblemSolver::Solve(const GradientProblemSolver::Options& options,
logging_callback.get());
}
scoped_ptr<IterationCallback> state_updating_callback;
std::unique_ptr<IterationCallback> state_updating_callback;
if (options.update_state_every_iteration) {
state_updating_callback.reset(
new GradientProblemSolverStateUpdatingCallback(
@@ -152,7 +152,7 @@ void GradientProblemSolver::Solve(const GradientProblemSolver::Options& options,
state_updating_callback.get());
}
scoped_ptr<Minimizer> minimizer(Minimizer::Create(LINE_SEARCH));
std::unique_ptr<Minimizer> minimizer(Minimizer::Create(LINE_SEARCH));
Solver::Summary solver_summary;
solver_summary.fixed_cost = 0.0;