commit 226a95e4887d6eebc743b8f90eadbfb95030739a
author Sameer Agarwal <sameeragarwal@google.com> Sat May 31 23:53:43 2014 -0700
committer Sameer Agarwal <sandwichmaker@gmail.com> Sun Jun 01 06:55:18 2014 +0000
tree 63475c33e8a144cf74fda4dd636862d40490131e
parent 7135be7b340bc1685a61e8e8053ef9f6766bf61f

Fix more typos in solver.cc

A number of typos in solver.cc which were hidden behind ifdefs
and were only revealed when building under android.

Change-Id: I89cbe8056da071479d2d1a251a8919b0be1f1cd4

internal/ceres/solver.cc

diff --git a/internal/ceres/solver.cc b/internal/ceres/solver.cc
index 5ea3e82..dcdb129 100644
--- a/internal/ceres/solver.cc
+++ b/internal/ceres/solver.cc
@@ -145,19 +145,19 @@
 
 #ifdef CERES_NO_LAPACK
   if (options.dense_linear_algebra_library_type == LAPACK) {
-    if (options.type == DENSE_NORMAL_CHOLESKY) {
+    if (options.linear_solver_type == DENSE_NORMAL_CHOLESKY) {
       *error = "Can't use DENSE_NORMAL_CHOLESKY with LAPACK because "
           "LAPACK was not enabled when Ceres was built.";
       return false;
     }
 
-    if (options.type == DENSE_QR) {
+    if (options.linear_solver_type == DENSE_QR) {
       *error = "Can't use DENSE_QR with LAPACK because "
           "LAPACK was not enabled when Ceres was built.";
       return false;
     }
 
-    if (options.type == DENSE_SCHUR) {
+    if (options.linear_solver_type == DENSE_SCHUR) {
       *error = "Can't use DENSE_SCHUR with LAPACK because "
           "LAPACK was not enabled when Ceres was built.";
       return false;
@@ -167,13 +167,13 @@
 
 #ifdef CERES_NO_SUITESPARSE
   if (options.sparse_linear_algebra_library_type == SUITE_SPARSE) {
-    if (options.type == SPARSE_NORMAL_CHOLESKY) {
+    if (options.linear_solver_type == SPARSE_NORMAL_CHOLESKY) {
       *error = "Can't use SPARSE_NORMAL_CHOLESKY with SUITESPARSE because "
              "SuiteSparse was not enabled when Ceres was built.";
       return false;
     }
 
-    if (options.type == SPARSE_SCHUR) {
+    if (options.linear_solver_type == SPARSE_SCHUR) {
       *error = "Can't use SPARSE_SCHUR with SUITESPARSE because "
           "SuiteSparse was not enabled when Ceres was built.";
       return false;
@@ -181,13 +181,13 @@
 
     if (options.preconditioner_type == CLUSTER_JACOBI) {
       *error =  "CLUSTER_JACOBI preconditioner not supported. "
-          "SuiteSparse was not enabled when Ceres was built."
+          "SuiteSparse was not enabled when Ceres was built.";
       return false;
     }
 
     if (options.preconditioner_type == CLUSTER_TRIDIAGONAL) {
       *error =  "CLUSTER_TRIDIAGONAL preconditioner not supported. "
-          "SuiteSparse was not enabled when Ceres was built."
+          "SuiteSparse was not enabled when Ceres was built.";
     return false;
     }
   }