commit d73acd035359886dfa1c5762b01c6f6449edcab8
author Sameer Agarwal <sameeragarwal@google.com> Mon Dec 02 12:02:03 2013 -0800
committer Sameer Agarwal <sameeragarwal@google.com> Mon Dec 02 12:02:03 2013 -0800
tree e138f24636e401739cc7adb593f60a28e98ef332
parent 3faac6a28cec4c99c41421d3f585f3786be443b3

Lint cleanup from William Rucklidge.

Change-Id: I8abcfd369f41b895ce746a21a35f250fe05c39d1

internal/ceres/lapack.cc

diff --git a/internal/ceres/lapack.cc b/internal/ceres/lapack.cc
index 04a87e8..e124d75 100644
--- a/internal/ceres/lapack.cc
+++ b/internal/ceres/lapack.cc
@@ -94,7 +94,7 @@
     *message =
         StringPrintf(
             "LAPACK::dpotrf numerical failure. "
-             "The leading minor of order %d  is not positive definite.", info);
+             "The leading minor of order %d is not positive definite.", info);
     return LINEAR_SOLVER_FAILURE;
   }
 

internal/ceres/line_search_minimizer.cc

diff --git a/internal/ceres/line_search_minimizer.cc b/internal/ceres/line_search_minimizer.cc
index 4590afe..67c2648 100644
--- a/internal/ceres/line_search_minimizer.cc
+++ b/internal/ceres/line_search_minimizer.cc
@@ -252,7 +252,7 @@
       // have already reached our specified maximum number of restarts,
       // terminate optimization.
       summary->error =
-          StringPrintf("Termination: Line search direction failure: specified "
+          StringPrintf("Terminating: Line search direction failure: specified "
                        "max_num_line_search_direction_restarts: %d reached.",
                        options.max_num_line_search_direction_restarts);
       summary->termination_type = NUMERICAL_FAILURE;

internal/ceres/suitesparse.cc

diff --git a/internal/ceres/suitesparse.cc b/internal/ceres/suitesparse.cc
index 3cafe07..8079bc1 100644
--- a/internal/ceres/suitesparse.cc
+++ b/internal/ceres/suitesparse.cc
@@ -138,7 +138,7 @@
 
   if (cc_.status != CHOLMOD_OK) {
     *message = StringPrintf("cholmod_analyze failed. error code: %d",
-                           cc_.status);
+                            cc_.status);
     return NULL;
   }
 
@@ -173,7 +173,7 @@
   }
   if (cc_.status != CHOLMOD_OK) {
     *message = StringPrintf("cholmod_analyze failed. error code: %d",
-                           cc_.status);
+                            cc_.status);
     return NULL;
   }
 
@@ -193,7 +193,7 @@
   }
   if (cc_.status != CHOLMOD_OK) {
     *message = StringPrintf("cholmod_analyze failed. error code: %d",
-                           cc_.status);
+                            cc_.status);
     return NULL;
   }
 
@@ -292,8 +292,8 @@
       }
 
       *message = "CHOLMOD failure: cholmod_factorize returned false "
-                "but cholmod_common::status is CHOLMOD_OK."
-                "Please report this to ceres-solver@googlegroups.com.";
+          "but cholmod_common::status is CHOLMOD_OK."
+          "Please report this to ceres-solver@googlegroups.com.";
       return LINEAR_SOLVER_FATAL_ERROR;
     default:
       *message =

internal/ceres/trust_region_minimizer.cc

diff --git a/internal/ceres/trust_region_minimizer.cc b/internal/ceres/trust_region_minimizer.cc
index 802f0bf..8c5800e 100644
--- a/internal/ceres/trust_region_minimizer.cc
+++ b/internal/ceres/trust_region_minimizer.cc
@@ -155,10 +155,10 @@
 
   if (iteration_summary.gradient_max_norm <= absolute_gradient_tolerance) {
     summary->error = StringPrintf("Terminating: Gradient tolerance reached. "
-                                    "Relative gradient max norm: %e <= %e",
-                                    (iteration_summary.gradient_max_norm /
-                                     initial_gradient_max_norm),
-                                    options_.gradient_tolerance);
+                                  "Relative gradient max norm: %e <= %e",
+                                  (iteration_summary.gradient_max_norm /
+                                   initial_gradient_max_norm),
+                                  options_.gradient_tolerance);
     summary->termination_type = GRADIENT_TOLERANCE;
     VLOG_IF(1, is_not_silent) << summary->error;
     return;

internal/ceres/unsymmetric_linear_solver_test.cc

diff --git a/internal/ceres/unsymmetric_linear_solver_test.cc b/internal/ceres/unsymmetric_linear_solver_test.cc
index 9784b46..949fdd1 100644
--- a/internal/ceres/unsymmetric_linear_solver_test.cc
+++ b/internal/ceres/unsymmetric_linear_solver_test.cc
@@ -99,13 +99,15 @@
                       per_solve_options,
                       x_regularized.data());
 
-    EXPECT_EQ(unregularized_solve_summary.termination_type, LINEAR_SOLVER_SUCCESS);
+    EXPECT_EQ(unregularized_solve_summary.termination_type,
+              LINEAR_SOLVER_SUCCESS);
 
     for (int i = 0; i < A_->num_cols(); ++i) {
       EXPECT_NEAR(sol_unregularized_[i], x_unregularized[i], 1e-8);
     }
 
-    EXPECT_EQ(regularized_solve_summary.termination_type, LINEAR_SOLVER_SUCCESS);
+    EXPECT_EQ(regularized_solve_summary.termination_type,
+              LINEAR_SOLVER_SUCCESS);
     for (int i = 0; i < A_->num_cols(); ++i) {
       EXPECT_NEAR(sol_regularized_[i], x_regularized[i], 1e-8);
     }