GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-05-02 08:44:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #1086: replace deprecated UF_long by SuiteSparse_long

Browse Source
This commit is contained in:
Gael Guennebaud 2015-10-12 16:20:12 +02:00
parent 6407e367ee
commit 252e89b11b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/CholmodSupport/CholmodSupport.h
View File

@ -78,7 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatrix<_Scalar,_Options,_StorageIndex>& mat)
{ {
res.itype = CHOLMOD_INT; res.itype = CHOLMOD_INT;
} }
else if (internal::is_same<_StorageIndex,UF_long>::value) else if (internal::is_same<_StorageIndex,SuiteSparse_long>::value)
{ {
res.itype = CHOLMOD_LONG; res.itype = CHOLMOD_LONG;
} }

4
Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
View File

@ -48,7 +48,7 @@ namespace Eigen {
* You can then apply it to a vector. * You can then apply it to a vector.
* *
* R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix. * R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix.
* NOTE : The Index type of R is always UF_long. You can get it with SPQR::Index * NOTE : The Index type of R is always SuiteSparse_long. You can get it with SPQR::Index
* *
* \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<> * \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<>
* *
@ -65,7 +65,7 @@ class SPQR : public SparseSolverBase<SPQR<_MatrixType> >
public: public:
typedef typename _MatrixType::Scalar Scalar; typedef typename _MatrixType::Scalar Scalar;
typedef typename _MatrixType::RealScalar RealScalar; typedef typename _MatrixType::RealScalar RealScalar;
typedef UF_long StorageIndex ; typedef SuiteSparse_long StorageIndex ;
typedef SparseMatrix<Scalar, ColMajor, StorageIndex> MatrixType; typedef SparseMatrix<Scalar, ColMajor, StorageIndex> MatrixType;
typedef Map<PermutationMatrix<Dynamic, Dynamic, StorageIndex> > PermutationType; typedef Map<PermutationMatrix<Dynamic, Dynamic, StorageIndex> > PermutationType;
public: public: