From 1a8dc8514257cb931b1b5bca67004fa2b628133d Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Tue, 2 Dec 2014 13:57:13 +0100 Subject: bug #897: fix UmfPack usage with mapped sparse matrices --- Eigen/src/UmfPackSupport/UmfPackSupport.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'Eigen/src/UmfPackSupport') diff --git a/Eigen/src/UmfPackSupport/UmfPackSupport.h b/Eigen/src/UmfPackSupport/UmfPackSupport.h index 1dc7ddba0..29ee516d9 100644 --- a/Eigen/src/UmfPackSupport/UmfPackSupport.h +++ b/Eigen/src/UmfPackSupport/UmfPackSupport.h @@ -196,7 +196,8 @@ class UmfPackLU : public SparseSolverBase > * Note that the matrix should be column-major, and in compressed format for best performance. * \sa SparseMatrix::makeCompressed(). */ - void compute(const MatrixType& matrix) + template + void compute(const InputMatrixType& matrix) { analyzePattern(matrix); factorize(matrix); @@ -208,7 +209,8 @@ class UmfPackLU : public SparseSolverBase > * * \sa factorize(), compute() */ - void analyzePattern(const MatrixType& matrix) + template + void analyzePattern(const InputMatrixType& matrix) { if(m_symbolic) umfpack_free_symbolic(&m_symbolic,Scalar()); @@ -234,7 +236,8 @@ class UmfPackLU : public SparseSolverBase > * * \sa analyzePattern(), compute() */ - void factorize(const MatrixType& matrix) + template + void factorize(const InputMatrixType& matrix) { eigen_assert(m_analysisIsOk && "UmfPackLU: you must first call analyzePattern()"); if(m_numeric) @@ -276,7 +279,8 @@ class UmfPackLU : public SparseSolverBase > m_extractedDataAreDirty = true; } - void grapInput(const MatrixType& mat) + template + void grapInput(const InputMatrixType& mat) { m_copyMatrix.resize(mat.rows(), mat.cols()); if( ((MatrixType::Flags&RowMajorBit)==RowMajorBit) || sizeof(typename MatrixType::Index)!=sizeof(int) || !mat.isCompressed() ) -- cgit v1.2.3