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

Fix SparseMatrix::conservativeResize() when one dimension is null

Browse Source
This commit is contained in:
Gael Guennebaud 2013-07-12 14:10:02 +02:00
parent 444c09e313
commit 5431473d67
1 changed files with 53 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,59 +531,63 @@ class SparseMatrix
*/ */
void conservativeResize(Index rows, Index cols) void conservativeResize(Index rows, Index cols)
{ {
// No change // No change
if (this->rows() == rows && this->cols() == cols) return; if (this->rows() == rows && this->cols() == cols) return;
// If one dimension is null, then there is nothing to be preserved
if(rows==0 || cols==0) return resize(rows,cols);
Index innerChange = IsRowMajor ? cols - this->cols() : rows - this->rows(); Index innerChange = IsRowMajor ? cols - this->cols() : rows - this->rows();
Index outerChange = IsRowMajor ? rows - this->rows() : cols - this->cols(); Index outerChange = IsRowMajor ? rows - this->rows() : cols - this->cols();
Index newInnerSize = IsRowMajor ? cols : rows; Index newInnerSize = IsRowMajor ? cols : rows;
// Deals with inner non zeros // Deals with inner non zeros
if (m_innerNonZeros) if (m_innerNonZeros)
{
// Resize m_innerNonZeros
Index *newInnerNonZeros = static_cast<Index*>(std::realloc(m_innerNonZeros, (m_outerSize + outerChange) * sizeof(Index)));
if (!newInnerNonZeros) internal::throw_std_bad_alloc();
m_innerNonZeros = newInnerNonZeros;
for(Index i=m_outerSize; i<m_outerSize+outerChange; i++)
m_innerNonZeros[i] = 0;
}
else if (innerChange < 0)
{
// Inner size decreased: allocate a new m_innerNonZeros
m_innerNonZeros = static_cast<Index*>(std::malloc((m_outerSize+outerChange+1) * sizeof(Index)));
if (!m_innerNonZeros) internal::throw_std_bad_alloc();
for(Index i = 0; i < m_outerSize; i++)
m_innerNonZeros[i] = m_outerIndex[i+1] - m_outerIndex[i];
}
// Change the m_innerNonZeros in case of a decrease of inner size
if (m_innerNonZeros && innerChange < 0)
{
for(Index i = 0; i < m_outerSize + (std::min)(outerChange, Index(0)); i++)
{ {
// Resize m_innerNonZeros Index &n = m_innerNonZeros[i];
Index *newInnerNonZeros = static_cast<Index*>(std::realloc(m_innerNonZeros, (m_outerSize + outerChange) * sizeof(Index))); Index start = m_outerIndex[i];
if (!newInnerNonZeros) internal::throw_std_bad_alloc(); while (n > 0 && m_data.index(start+n-1) >= newInnerSize) --n;
m_innerNonZeros = newInnerNonZeros; }
}
m_innerSize = newInnerSize;
// Re-allocate outer index structure if necessary
if (outerChange == 0)
return;
for(Index i=m_outerSize; i<m_outerSize+outerChange; i++) Index *newOuterIndex = static_cast<Index*>(std::realloc(m_outerIndex, (m_outerSize + outerChange + 1) * sizeof(Index)));
m_innerNonZeros[i] = 0; if (!newOuterIndex) internal::throw_std_bad_alloc();
} m_outerIndex = newOuterIndex;
else if (innerChange < 0) if (outerChange > 0)
{ {
// Inner size decreased: allocate a new m_innerNonZeros Index last = m_outerSize == 0 ? 0 : m_outerIndex[m_outerSize];
m_innerNonZeros = static_cast<Index*>(std::malloc((m_outerSize+outerChange+1) * sizeof(Index))); for(Index i=m_outerSize; i<m_outerSize+outerChange+1; i++)
if (!m_innerNonZeros) internal::throw_std_bad_alloc(); m_outerIndex[i] = last;
for(Index i = 0; i < m_outerSize; i++) }
m_innerNonZeros[i] = m_outerIndex[i+1] - m_outerIndex[i]; m_outerSize += outerChange;
}
// Change the m_innerNonZeros in case of a decrease of inner size
if (m_innerNonZeros && innerChange < 0) {
for(Index i = 0; i < m_outerSize + (std::min)(outerChange, Index(0)); i++)
{
Index &n = m_innerNonZeros[i];
Index start = m_outerIndex[i];
while (n > 0 && m_data.index(start+n-1) >= newInnerSize) --n;
}
}
m_innerSize = newInnerSize;
// Re-allocate outer index structure if necessary
if (outerChange == 0)
return;
Index *newOuterIndex = static_cast<Index*>(std::realloc(m_outerIndex, (m_outerSize + outerChange + 1) * sizeof(Index)));
if (!newOuterIndex) internal::throw_std_bad_alloc();
m_outerIndex = newOuterIndex;
if (outerChange > 0) {
Index last = m_outerSize == 0 ? 0 : m_outerIndex[m_outerSize];
for(Index i=m_outerSize; i<m_outerSize+outerChange+1; i++)
m_outerIndex[i] = last;
}
m_outerSize += outerChange;
} }
/** Resizes the matrix to a \a rows x \a cols matrix and initializes it to zero. /** Resizes the matrix to a \a rows x \a cols matrix and initializes it to zero.