Small fixes from William Rucklidge. Change-Id: I0be52f0f1e53cedccffe4807dc664a2f3fb4a8e4
diff --git a/docs/source/solving.rst b/docs/source/solving.rst index b7bc0b1..5f3711a 100644 --- a/docs/source/solving.rst +++ b/docs/source/solving.rst
@@ -1158,7 +1158,7 @@ Type of linear solver used to compute the solution to the linear least squares problem in each iteration of the Levenberg-Marquardt - algorithm. If Ceres is build with support for ``SuiteSparse`` or + algorithm. If Ceres is built with support for ``SuiteSparse`` or ``CXSparse`` or ``Eigen``'s sparse Cholesky factorization, the default is ``SPARSE_NORMAL_CHOLESKY``, it is ``DENSE_QR`` otherwise.
diff --git a/internal/ceres/schur_complement_solver.cc b/internal/ceres/schur_complement_solver.cc index 33f2d8e..d2aa168 100644 --- a/internal/ceres/schur_complement_solver.cc +++ b/internal/ceres/schur_complement_solver.cc
@@ -276,7 +276,7 @@ LinearSolver::Summary summary; summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; - summary.message = "Ceres was not built with SuiteSparse support." + summary.message = "Ceres was not built with SuiteSparse support. " "Therefore, SPARSE_SCHUR cannot be used with SUITE_SPARSE"; return summary; @@ -383,7 +383,7 @@ LinearSolver::Summary summary; summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; - summary.message = "Ceres was not built with CXSparse support." + summary.message = "Ceres was not built with CXSparse support. " "Therefore, SPARSE_SCHUR cannot be used with CX_SPARSE"; return summary; @@ -440,9 +440,9 @@ summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; summary.message = - "SPARSE_SCHUR cannot be used with EIGEN_SPARSE." - "Ceres was not built with support for" - "Eigen's SimplicialLDLT decomposition." + "SPARSE_SCHUR cannot be used with EIGEN_SPARSE. " + "Ceres was not built with support for " + "Eigen's SimplicialLDLT decomposition. " "This requires enabling building with -DEIGENSPARSE=ON."; return summary;
diff --git a/internal/ceres/sparse_normal_cholesky_solver.cc b/internal/ceres/sparse_normal_cholesky_solver.cc index 42054e5..0940815 100644 --- a/internal/ceres/sparse_normal_cholesky_solver.cc +++ b/internal/ceres/sparse_normal_cholesky_solver.cc
@@ -132,9 +132,9 @@ summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; summary.message = - "SPARSE_NORMAL_CHOLESKY cannot be used with EIGEN_SPARSE" - "because Ceres was not built with support for" - "Eigen's SimplicialLDLT decomposition." + "SPARSE_NORMAL_CHOLESKY cannot be used with EIGEN_SPARSE " + "because Ceres was not built with support for " + "Eigen's SimplicialLDLT decomposition. " "This requires enabling building with -DEIGENSPARSE=ON."; return summary; @@ -229,8 +229,8 @@ summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; summary.message = - "SPARSE_NORMAL_CHOLESKY cannot be used with CX_SPARSE" - "because Ceres was not built with support for CXSparse." + "SPARSE_NORMAL_CHOLESKY cannot be used with CX_SPARSE " + "because Ceres was not built with support for CXSparse. " "This requires enabling building with -DCXSPARSE=ON."; return summary; @@ -311,8 +311,8 @@ summary.num_iterations = 0; summary.termination_type = LINEAR_SOLVER_FATAL_ERROR; summary.message = - "SPARSE_NORMAL_CHOLESKY cannot be used with SUITE_SPARSE" - "because Ceres was not built with support for SuiteSparse." + "SPARSE_NORMAL_CHOLESKY cannot be used with SUITE_SPARSE " + "because Ceres was not built with support for SuiteSparse. " "This requires enabling building with -DSUITESPARSE=ON."; return summary;