From 46b8461fd010c1e7ffce6bb2bdf8a84b659d5e09 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Mon, 29 Sep 2014 15:10:58 -0700 Subject: [PATCH] Various minor fixes from William Rucklidge. Change-Id: Ibe731d5db374ad8ee148d62a9fdd8d726b607a3f --- internal/ceres/block_jacobi_preconditioner.cc | 4 ---- internal/ceres/block_jacobi_preconditioner.h | 1 - internal/ceres/solver.cc | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/internal/ceres/block_jacobi_preconditioner.cc b/internal/ceres/block_jacobi_preconditioner.cc index ea49f077e..7f79a4f99 100644 --- a/internal/ceres/block_jacobi_preconditioner.cc +++ b/internal/ceres/block_jacobi_preconditioner.cc @@ -102,9 +102,5 @@ void BlockJacobiPreconditioner::RightMultiply(const double* x, m_->RightMultiply(x, y); } -void BlockJacobiPreconditioner::LeftMultiply(const double* x, double* y) const { - m_->RightMultiply(x, y); -} - } // namespace internal } // namespace ceres diff --git a/internal/ceres/block_jacobi_preconditioner.h b/internal/ceres/block_jacobi_preconditioner.h index 857929709..e23e0e2d2 100644 --- a/internal/ceres/block_jacobi_preconditioner.h +++ b/internal/ceres/block_jacobi_preconditioner.h @@ -60,7 +60,6 @@ class BlockJacobiPreconditioner : public BlockSparseMatrixPreconditioner { // Preconditioner interface virtual void RightMultiply(const double* x, double* y) const; - virtual void LeftMultiply(const double* x, double* y) const; virtual int num_rows() const { return m_->num_rows(); } virtual int num_cols() const { return m_->num_rows(); } diff --git a/internal/ceres/solver.cc b/internal/ceres/solver.cc index e1c5ee30b..3512e156f 100644 --- a/internal/ceres/solver.cc +++ b/internal/ceres/solver.cc @@ -123,7 +123,7 @@ bool TrustRegionOptionsAreValid(const Solver::Options& options, string* error) { if (options.linear_solver_type == ITERATIVE_SCHUR && options.use_explicit_schur_complement && options.preconditioner_type != SCHUR_JACOBI) { - *error = "use_explicit_schur_complement only supports" + *error = "use_explicit_schur_complement only supports " "SCHUR_JACOBI as the preconditioner."; return false; }