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

Added implicit integer conversion by using explicit integer type conversion. Adding assert to catch overflow.

Browse Source
This commit is contained in:
Georg Drenkhahn 2014-09-22 18:47:33 +02:00
parent f0a62c90bc
commit 9a04cd307c
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Eigen/src/SparseLU/SparseLU.h
View File

@ -675,8 +675,11 @@ struct SparseLUMatrixUReturnType : internal::no_assignment_operator
template<typename Dest> void solveInPlace(MatrixBase<Dest> &X) const template<typename Dest> void solveInPlace(MatrixBase<Dest> &X) const
{ {
Index nrhs = X.cols(); /* Explicit type conversion as the Index type of MatrixBase<Dest> may be wider than Index */
Index n = X.rows(); eigen_assert(X.rows() <= NumTraits<Index>::highest());
eigen_assert(X.cols() <= NumTraits<Index>::highest());
Index nrhs = Index(X.cols());
Index n = Index(X.rows());
// Backward solve with U // Backward solve with U
for (Index k = m_mapL.nsuper(); k >= 0; k--) for (Index k = m_mapL.nsuper(); k >= 0; k--)
{ {

7
Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
View File

@ -233,8 +233,11 @@ template<typename Scalar, typename Index>
template<typename Dest> template<typename Dest>
void MappedSuperNodalMatrix<Scalar,Index>::solveInPlace( MatrixBase<Dest>&X) const void MappedSuperNodalMatrix<Scalar,Index>::solveInPlace( MatrixBase<Dest>&X) const
{ {
Index n = X.rows(); /* Explicit type conversion as the Index type of MatrixBase<Dest> may be wider than Index */
Index nrhs = X.cols(); eigen_assert(X.rows() <= NumTraits<Index>::highest());
eigen_assert(X.cols() <= NumTraits<Index>::highest());
Index n = Index(X.rows());
Index nrhs = Index(X.cols());
const Scalar * Lval = valuePtr(); // Nonzero values const Scalar * Lval = valuePtr(); // Nonzero values
Matrix<Scalar,Dynamic,Dynamic> work(n, nrhs); // working vector Matrix<Scalar,Dynamic,Dynamic> work(n, nrhs); // working vector
work.setZero(); work.setZero();