commit 89a592f410fb6f80c03dea84b6b9f1a10bea36c1
author Sameer Agarwal <sameeragarwal@google.com> Tue Nov 26 11:35:49 2013 -0800
committer Sameer Agarwal <sameeragarwal@google.com> Tue Nov 26 11:35:49 2013 -0800
tree fae0d1cb9eb51e58ef33923e3f219bf8019906fc
parent b16e118b96c55451c0d8556f3c5b52ad36b69cac

LinearSolver::Summary::status -> LinearSolver::Summary::message.

And a bunch of minor lint cleanups as they showed up.

Change-Id: I430a6b05710923c72daf6a5df4dfcd16fbf44b3a

internal/ceres/sparse_normal_cholesky_solver.cc

diff --git a/internal/ceres/sparse_normal_cholesky_solver.cc b/internal/ceres/sparse_normal_cholesky_solver.cc
index 2d03c44..ceeb654 100644
--- a/internal/ceres/sparse_normal_cholesky_solver.cc
+++ b/internal/ceres/sparse_normal_cholesky_solver.cc
@@ -103,7 +103,7 @@
   LinearSolver::Summary summary;
   summary.num_iterations = 1;
   summary.termination_type = TOLERANCE;
-  summary.status = "Success.";
+  summary.message = "Success.";
 
   const int num_cols = A->num_cols();
   Vector Atb = Vector::Zero(num_cols);
@@ -151,7 +151,8 @@
 
   if (cxsparse_factor_ == NULL) {
     summary.termination_type = FATAL_ERROR;
-    summary.status = "CXSparse failure. Unable to find symbolic factorization.";
+    summary.message =
+        "CXSparse failure. Unable to find symbolic factorization.";
   } else if (cxsparse_.SolveCholesky(AtA, cxsparse_factor_, Atb.data())) {
     VectorRef(x, Atb.rows()) = Atb;
   } else {
@@ -186,7 +187,7 @@
   LinearSolver::Summary summary;
   summary.termination_type = TOLERANCE;
   summary.num_iterations = 1;
-  summary.status = "Success.";
+  summary.message = "Success.";
 
   const int num_cols = A->num_cols();
   Vector Atb = Vector::Zero(num_cols);
@@ -208,9 +209,9 @@
       factor_ = ss_.BlockAnalyzeCholesky(&lhs,
                                          A->col_blocks(),
                                          A->row_blocks(),
-                                         &summary.status);
+                                         &summary.message);
     } else {
-      factor_ = ss_.AnalyzeCholeskyWithNaturalOrdering(&lhs, &summary.status);
+      factor_ = ss_.AnalyzeCholeskyWithNaturalOrdering(&lhs, &summary.message);
     }
   }
   event_logger.AddEvent("Analysis");
@@ -223,7 +224,7 @@
     return summary;
   }
 
-  summary.termination_type = ss_.Cholesky(&lhs, factor_, &summary.status);
+  summary.termination_type = ss_.Cholesky(&lhs, factor_, &summary.message);
   if (summary.termination_type != TOLERANCE) {
     if (per_solve_options.D != NULL) {
       A->DeleteRows(num_cols);
@@ -232,7 +233,7 @@
   }
 
   cholmod_dense* rhs = ss_.CreateDenseVector(Atb.data(), num_cols, num_cols);
-  cholmod_dense* sol = ss_.Solve(factor_, rhs, &summary.status);
+  cholmod_dense* sol = ss_.Solve(factor_, rhs, &summary.message);
   event_logger.AddEvent("Solve");
 
   ss_.Free(rhs);