mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 08:34:37 +08:00
Removing using std::...
Change-Id: I584402e2a34869183c1d59071a15d97b216c52fb
This commit is contained in:
@@ -49,7 +49,6 @@
|
||||
namespace ceres {
|
||||
using internal::StringAppendF;
|
||||
using internal::StringPrintf;
|
||||
using std::string;
|
||||
|
||||
namespace {
|
||||
|
||||
@@ -181,7 +180,7 @@ void GradientProblemSolver::Solve(const GradientProblemSolver::Options& options,
|
||||
SetSummaryFinalCost(summary);
|
||||
}
|
||||
|
||||
const std::map<string, CallStatistics>& evaluator_statistics =
|
||||
const std::map<std::string, CallStatistics>& evaluator_statistics =
|
||||
minimizer_options.evaluator->Statistics();
|
||||
{
|
||||
const CallStatistics& call_stats = FindWithDefault(
|
||||
@@ -204,7 +203,7 @@ bool GradientProblemSolver::Summary::IsSolutionUsable() const {
|
||||
return internal::IsSolutionUsable(*this);
|
||||
}
|
||||
|
||||
string GradientProblemSolver::Summary::BriefReport() const {
|
||||
std::string GradientProblemSolver::Summary::BriefReport() const {
|
||||
return StringPrintf(
|
||||
"Ceres GradientProblemSolver Report: "
|
||||
"Iterations: %d, "
|
||||
@@ -217,12 +216,12 @@ string GradientProblemSolver::Summary::BriefReport() const {
|
||||
TerminationTypeToString(termination_type));
|
||||
}
|
||||
|
||||
string GradientProblemSolver::Summary::FullReport() const {
|
||||
std::string GradientProblemSolver::Summary::FullReport() const {
|
||||
using internal::VersionString;
|
||||
|
||||
// NOTE operator+ is not usable for concatenating a string and a string_view.
|
||||
string report =
|
||||
string{"\nSolver Summary (v "}.append(VersionString()) + ")\n\n";
|
||||
std::string report =
|
||||
std::string{"\nSolver Summary (v "}.append(VersionString()) + ")\n\n";
|
||||
|
||||
StringAppendF(&report, "Parameters % 25d\n", num_parameters);
|
||||
if (num_tangent_parameters != num_parameters) {
|
||||
@@ -230,7 +229,7 @@ string GradientProblemSolver::Summary::FullReport() const {
|
||||
&report, "Tangent parameters % 25d\n", num_tangent_parameters);
|
||||
}
|
||||
|
||||
string line_search_direction_string;
|
||||
std::string line_search_direction_string;
|
||||
if (line_search_direction_type == LBFGS) {
|
||||
line_search_direction_string = StringPrintf("LBFGS (%d)", max_lbfgs_rank);
|
||||
} else if (line_search_direction_type == NONLINEAR_CONJUGATE_GRADIENT) {
|
||||
@@ -245,7 +244,7 @@ string GradientProblemSolver::Summary::FullReport() const {
|
||||
"Line search direction %19s\n",
|
||||
line_search_direction_string.c_str());
|
||||
|
||||
const string line_search_type_string = StringPrintf(
|
||||
const std::string line_search_type_string = StringPrintf(
|
||||
"%s %s",
|
||||
LineSearchInterpolationTypeToString(line_search_interpolation_type),
|
||||
LineSearchTypeToString(line_search_type));
|
||||
|
||||
Reference in New Issue
Block a user