GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 20:26:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix sparse warnings

Browse Source
This commit is contained in:
Charles Schlosser 2023-01-27 22:47:42 +00:00
parent 17ae83a966
commit 1aa6dc2007
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -246,7 +246,7 @@ class SparseMatrix
if (capacity > 0) { if (capacity > 0) {
// implies uncompressed: push to back of vector // implies uncompressed: push to back of vector
m_innerNonZeros[outer]++; m_innerNonZeros[outer]++;
m_data.index(end) = inner; m_data.index(end) = StorageIndex(inner);
m_data.value(end) = Scalar(0); m_data.value(end) = Scalar(0);
return m_data.value(end); return m_data.value(end);
} }
@ -379,7 +379,7 @@ class SparseMatrix
Index count = 0; Index count = 0;
for(Index j=0; j<m_outerSize; ++j) for(Index j=0; j<m_outerSize; ++j)
{ {
newOuterIndex[j] = count; newOuterIndex[j] = internal::convert_index<StorageIndex>(count);
Index alreadyReserved = internal::convert_index<Index>(m_outerIndex[j+1] - m_outerIndex[j] - m_innerNonZeros[j]); Index alreadyReserved = internal::convert_index<Index>(m_outerIndex[j+1] - m_outerIndex[j] - m_innerNonZeros[j]);
Index reserveSize = internal::convert_index<Index>(reserveSizes[j]); Index reserveSize = internal::convert_index<Index>(reserveSizes[j]);
Index toReserve = numext::maxi(reserveSize, alreadyReserved); Index toReserve = numext::maxi(reserveSize, alreadyReserved);
@ -392,7 +392,6 @@ class SparseMatrix
{ {
StorageIndex innerNNZ = m_innerNonZeros[j]; StorageIndex innerNNZ = m_innerNonZeros[j];
StorageIndex begin = m_outerIndex[j]; StorageIndex begin = m_outerIndex[j];
StorageIndex end = begin + innerNNZ;
StorageIndex target = newOuterIndex[j]; StorageIndex target = newOuterIndex[j];
m_data.moveChunk(begin, target, innerNNZ); m_data.moveChunk(begin, target, innerNNZ);
} }
@ -504,7 +503,7 @@ class SparseMatrix
if (capacity > 0) { if (capacity > 0) {
// implies uncompressed: push to back of vector // implies uncompressed: push to back of vector
m_innerNonZeros[j]++; m_innerNonZeros[j]++;
m_data.index(end) = i; m_data.index(end) = StorageIndex(i);
m_data.value(end) = Scalar(0); m_data.value(end) = Scalar(0);
return m_data.value(end); return m_data.value(end);
} }
@ -529,8 +528,8 @@ class SparseMatrix
Index copyTarget = m_innerNonZeros[0]; Index copyTarget = m_innerNonZeros[0];
for (Index j = 1; j < m_outerSize; j++) for (Index j = 1; j < m_outerSize; j++)
{ {
Index end = start + m_innerNonZeros[j]; StorageIndex end = start + m_innerNonZeros[j];
Index nextStart = m_outerIndex[j + 1]; StorageIndex nextStart = m_outerIndex[j + 1];
// dont forget to move the last chunk! // dont forget to move the last chunk!
bool breakUpCopy = (end != nextStart) || (j == m_outerSize - 1); bool breakUpCopy = (end != nextStart) || (j == m_outerSize - 1);
if (breakUpCopy) if (breakUpCopy)
@ -966,7 +965,7 @@ public:
eigen_assert(m_innerNonZeros[outer]<=(m_outerIndex[outer+1] - m_outerIndex[outer])); eigen_assert(m_innerNonZeros[outer]<=(m_outerIndex[outer+1] - m_outerIndex[outer]));
Index p = m_outerIndex[outer] + m_innerNonZeros[outer]++; Index p = m_outerIndex[outer] + m_innerNonZeros[outer]++;
m_data.index(p) = convert_index(inner); m_data.index(p) = StorageIndex(inner);
m_data.value(p) = Scalar(0); m_data.value(p) = Scalar(0);
return m_data.value(p); return m_data.value(p);
} }
@ -1032,7 +1031,7 @@ protected:
Index capacity = m_outerIndex[j + 1] - end; Index capacity = m_outerIndex[j + 1] - end;
Index dst = m_data.searchLowerIndex(begin, end, j); Index dst = m_data.searchLowerIndex(begin, end, j);
// the entry exists: update it now // the entry exists: update it now
if (dst != end && m_data.index(dst) == j) assignFunc.assignCoeff(m_data.value(dst), diaEval.coeff(j)); if (dst != end && m_data.index(dst) == StorageIndex(j)) assignFunc.assignCoeff(m_data.value(dst), diaEval.coeff(j));
// the entry belongs at the back of the vector: push to back // the entry belongs at the back of the vector: push to back
else if (dst == end && capacity > 0) else if (dst == end && capacity > 0)
assignFunc.assignCoeff(insertBackUncompressed(j, j), diaEval.coeff(j)); assignFunc.assignCoeff(insertBackUncompressed(j, j), diaEval.coeff(j));
@ -1450,7 +1449,7 @@ SparseMatrix<Scalar_, Options_, StorageIndex_>::insertUncompressed(Index row, In
if (capacity > 0) { if (capacity > 0) {
// implies uncompressed: push to back of vector // implies uncompressed: push to back of vector
m_innerNonZeros[outer]++; m_innerNonZeros[outer]++;
m_data.index(end) = inner; m_data.index(end) = StorageIndex(inner);
m_data.value(end) = Scalar(0); m_data.value(end) = Scalar(0);
return m_data.value(end); return m_data.value(end);
} }