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

Fix implicit conversion from 0.0 to scalar

Browse Source
This commit is contained in:
Gael Guennebaud 2018-02-16 22:26:01 +04:00
parent 937ad18221
commit adb134d47e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/OrderingMethods/Ordering.h
View File

@ -31,7 +31,7 @@ void ordering_helper_at_plus_a(const MatrixType& A, MatrixType& symmat)
for (int i = 0; i < C.rows(); i++) for (int i = 0; i < C.rows(); i++)
{ {
for (typename MatrixType::InnerIterator it(C, i); it; ++it) for (typename MatrixType::InnerIterator it(C, i); it; ++it)
it.valueRef() = 0.0; it.valueRef() = typename MatrixType::Scalar(0);
} }
symmat = C + A; symmat = C + A;
} }

6
Eigen/src/SparseCholesky/SimplicialCholesky_impl.h
View File

@ -122,7 +122,7 @@ void SimplicialCholeskyBase<Derived>::factorize_preordered(const CholMatrixType&
for(StorageIndex k = 0; k < size; ++k) for(StorageIndex k = 0; k < size; ++k)
{ {
// compute nonzero pattern of kth row of L, in topological order // compute nonzero pattern of kth row of L, in topological order
y[k] = 0.0; // Y(0:k) is now all zero y[k] = Scalar(0); // Y(0:k) is now all zero
StorageIndex top = size; // stack for pattern is empty StorageIndex top = size; // stack for pattern is empty
tags[k] = k; // mark node k as visited tags[k] = k; // mark node k as visited
m_nonZerosPerCol[k] = 0; // count of nonzeros in column k of L m_nonZerosPerCol[k] = 0; // count of nonzeros in column k of L
@ -146,12 +146,12 @@ void SimplicialCholeskyBase<Derived>::factorize_preordered(const CholMatrixType&
/* compute numerical values kth row of L (a sparse triangular solve) */ /* compute numerical values kth row of L (a sparse triangular solve) */
RealScalar d = numext::real(y[k]) * m_shiftScale + m_shiftOffset; // get D(k,k), apply the shift function, and clear Y(k) RealScalar d = numext::real(y[k]) * m_shiftScale + m_shiftOffset; // get D(k,k), apply the shift function, and clear Y(k)
y[k] = 0.0; y[k] = Scalar(0);
for(; top < size; ++top) for(; top < size; ++top)
{ {
Index i = pattern[top]; /* pattern[top:n-1] is pattern of L(:,k) */ Index i = pattern[top]; /* pattern[top:n-1] is pattern of L(:,k) */
Scalar yi = y[i]; /* get and clear Y(i) */ Scalar yi = y[i]; /* get and clear Y(i) */
y[i] = 0.0; y[i] = Scalar(0);
/* the nonzero entry L(k,i) */ /* the nonzero entry L(k,i) */
Scalar l_ki; Scalar l_ki;