Rename LinearSolverTerminationType enums.
This increases clarity, drops redundant enums and makes things
cleaner all around.
Change-Id: I761f195ddf17ea6bd8e4e55bf5a72863660c4c3b
diff --git a/internal/ceres/lapack.cc b/internal/ceres/lapack.cc
index 0061433..c4f9302 100644
--- a/internal/ceres/lapack.cc
+++ b/internal/ceres/lapack.cc
@@ -73,7 +73,7 @@
string* status) {
#ifdef CERES_NO_LAPACK
LOG(FATAL) << "Ceres was built without a BLAS library.";
- return FATAL_ERROR;
+ return LINEAR_SOLVER_FATAL_ERROR;
#else
char uplo = 'L';
int n = num_rows;
@@ -87,7 +87,7 @@
<< "Please report it."
<< "LAPACK::dpotrf fatal error."
<< "Argument: " << -info << " is invalid.";
- return FATAL_ERROR;
+ return LINEAR_SOLVER_FATAL_ERROR;
}
if (info > 0) {
@@ -95,7 +95,7 @@
StringPrintf(
"LAPACK::dpotrf numerical failure. "
"The leading minor of order %d is not positive definite.", info);
- return FAILURE;
+ return LINEAR_SOLVER_FAILURE;
}
dpotrs_(&uplo, &n, &nrhs, lhs, &n, rhs_and_solution, &n, &info);
@@ -104,11 +104,11 @@
<< "Please report it."
<< "LAPACK::dpotrs fatal error."
<< "Argument: " << -info << " is invalid.";
- return FATAL_ERROR;
+ return LINEAR_SOLVER_FATAL_ERROR;
}
*status = "Success";
- return TOLERANCE;
+ return LINEAR_SOLVER_SUCCESS;
#endif
};
@@ -154,7 +154,7 @@
string* status) {
#ifdef CERES_NO_LAPACK
LOG(FATAL) << "Ceres was built without a LAPACK library.";
- return FATAL_ERROR;
+ return LINEAR_SOLVER_FATAL_ERROR;
#else
char trans = 'N';
int m = num_rows;
@@ -185,7 +185,7 @@
}
*status = "Success.";
- return TOLERANCE;
+ return LINEAR_SOLVER_SUCCESS;
#endif
}