Fix build breakage on old versions of SuiteSparse.

Change-Id: I2a061615fc374abef2ed323c298359002a6fc5f1
This commit is contained in:
Sameer Agarwal
2013-12-02 15:43:20 -08:00
parent 5fd480692b
commit 3b1ad31a1f
+6 -6
View File
@@ -441,23 +441,23 @@ bool CovarianceImpl::ComputeCovarianceValuesUsingSparseCholesky() {
cholmod_jacobian_view.sorted = 1;
cholmod_jacobian_view.packed = 1;
string status;
cholmod_factor* factor = ss.AnalyzeCholesky(&cholmod_jacobian_view, &status);
string message;
cholmod_factor* factor = ss.AnalyzeCholesky(&cholmod_jacobian_view, &message);
event_logger.AddEvent("Symbolic Factorization");
if (factor == NULL) {
LOG(ERROR) << "Covariance estimation failed. "
<< "CHOLMOD symbolic cholesky factorization returned with: "
<< status;
<< message;
return false;
}
LinearSolverTerminationType termination_type =
ss.Cholesky(&cholmod_jacobian_view, factor, &status);
ss.Cholesky(&cholmod_jacobian_view, factor, &message);
event_logger.AddEvent("Numeric Factorization");
if (termination_type != LINEAR_SOLVER_SUCCESS) {
LOG(ERROR) << "Covariance estimation failed. "
<< "CHOLMOD numeric cholesky factorization returned with: "
<< status;
<< message;
ss.Free(factor);
return false;
}
@@ -506,7 +506,7 @@ bool CovarianceImpl::ComputeCovarianceValuesUsingSparseCholesky() {
}
rhs_x[r] = 1.0;
cholmod_dense* solution = ss.Solve(factor, rhs);
cholmod_dense* solution = ss.Solve(factor, rhs, &message);
double* solution_x = reinterpret_cast<double*>(solution->x);
for (int idx = row_begin; idx < row_end; ++idx) {
const int c = cols[idx];