From cbdeb79e913d2d2357cba0d17cf2192a8f2f6dd0 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Mon, 22 Apr 2013 10:18:18 -0700 Subject: [PATCH] Lint cleanup from William Rucklidge Change-Id: Id8b99a2f557efe3744e95a3947f26cdc0c9c269e --- include/ceres/solver.h | 2 +- internal/ceres/solver_impl.cc | 10 +++++----- internal/ceres/solver_impl.h | 2 +- internal/ceres/suitesparse.cc | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/ceres/solver.h b/include/ceres/solver.h index 97d082d80..8e3fa58f6 100644 --- a/include/ceres/solver.h +++ b/include/ceres/solver.h @@ -372,7 +372,7 @@ class Solver { // In some rare cases, it is worth using a more complicated // reordering algorithm which has slightly better runtime // performance at the expense of an extra copy of the Jacobian - // // matrix. Setting use_postordering to true enables this tradeoff. + // matrix. Setting use_postordering to true enables this tradeoff. bool use_postordering; // Some non-linear least squares problems have additional diff --git a/internal/ceres/solver_impl.cc b/internal/ceres/solver_impl.cc index 43c0be618..577929996 100644 --- a/internal/ceres/solver_impl.cc +++ b/internal/ceres/solver_impl.cc @@ -1357,8 +1357,8 @@ void SolverImpl::AlternateLinearSolverForSchurTypeLinearSolver( // CGNR currently only supports the JACOBI preconditioner. options->preconditioner_type = JACOBI; } else { - msg += StringPrintf("ITERATIVE_SCHUR with IDENTITY preconditioner " - "to CGNR with IDENTITY preconditioner."); + msg += "ITERATIVE_SCHUR with IDENTITY preconditioner" + "to CGNR with IDENTITY preconditioner."; } } LOG(WARNING) << msg; @@ -1371,8 +1371,8 @@ bool SolverImpl::ReorderProgramForSchurTypeLinearSolver( string* error) { // At this point one of two things is true. // - // 1. The user did not specify an ordering - ordering has one - // group containined all the parameter blocks. + // 1. The user did not specify an ordering - ordering has one group + // containing all the parameter blocks. // 2. The user specified an ordering, and the first group has // non-zero elements. @@ -1425,7 +1425,7 @@ bool SolverImpl::ReorderProgramForSchurTypeLinearSolver( TripletSparseMatrix* SolverImpl::CreateJacobianBlockSparsityTranspose( const Program* program) { - // Matrix to store the block sparsity structure of + // Matrix to store the block sparsity structure of the Jacobian. TripletSparseMatrix* tsm = new TripletSparseMatrix(program->NumParameterBlocks(), program->NumResidualBlocks(), diff --git a/internal/ceres/solver_impl.h b/internal/ceres/solver_impl.h index 22ca6229b..60fd2a208 100644 --- a/internal/ceres/solver_impl.h +++ b/internal/ceres/solver_impl.h @@ -167,7 +167,7 @@ class SolverImpl { // by the Schur eliminator occur before others and the residuals be // sorted in lexicographic order of their parameter blocks. // - // If ordering has atleast two groups, then apply the ordering, + // If ordering has at least two groups, then apply the ordering, // otherwise compute a new ordering using a Maximal Independent Set // algorithm and apply it. // diff --git a/internal/ceres/suitesparse.cc b/internal/ceres/suitesparse.cc index 5138b522d..d576f6af1 100644 --- a/internal/ceres/suitesparse.cc +++ b/internal/ceres/suitesparse.cc @@ -172,7 +172,8 @@ cholmod_factor* SuiteSparse::AnalyzeCholeskyWithUserOrdering( return factor; } -cholmod_factor* SuiteSparse::AnalyzeCholeskyWithNaturalOrdering(cholmod_sparse* A) { +cholmod_factor* SuiteSparse::AnalyzeCholeskyWithNaturalOrdering( + cholmod_sparse* A) { cc_.nmethods = 1; cc_.method[0].ordering = CHOLMOD_NATURAL; cc_.postorder = 0;