GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-23 21:34:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix MatrixNase::fillrand bug

Browse Source
This commit is contained in:
Gael Guennebaud 2009-01-26 14:01:16 +00:00
parent 2776a3197b
commit 9ea1050281
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Eigen/src/Sparse/SparseMatrix.h
View File

@ -175,7 +175,6 @@ class SparseMatrix
{ {
const int outer = IsRowMajor ? row : col; const int outer = IsRowMajor ? row : col;
const int inner = IsRowMajor ? col : row; const int inner = IsRowMajor ? col : row;
if (m_outerIndex[outer+1]==0) if (m_outerIndex[outer+1]==0)
{ {
// we start a new inner vector // we start a new inner vector
@ -188,14 +187,14 @@ class SparseMatrix
} }
m_outerIndex[outer+1] = m_outerIndex[outer]; m_outerIndex[outer+1] = m_outerIndex[outer];
} }
// std::cerr << this << " " << outer << " " << inner << " - " << m_outerIndex[outer] << " " << m_outerIndex[outer+1] << "\n";
assert(size_t(m_outerIndex[outer+1]) == m_data.size() && "invalid outer index"); assert(size_t(m_outerIndex[outer+1]) == m_data.size() && "invalid outer index");
size_t startId = m_outerIndex[outer]; size_t startId = m_outerIndex[outer];
size_t id = m_outerIndex[outer+1]-1; // FIXME let's make sure sizeof(long int) == sizeof(size_t)
size_t id = m_outerIndex[outer+1];
++m_outerIndex[outer+1]; ++m_outerIndex[outer+1];
float reallocRatio = 1; float reallocRatio = 1;
if (m_data.allocatedSize()<id+2) if (m_data.allocatedSize()<id+1)
{ {
// we need to reallocate the data, to reduce multiple reallocations // we need to reallocate the data, to reduce multiple reallocations
// we use a smart resize algorithm based on the current filling ratio // we use a smart resize algorithm based on the current filling ratio
@ -207,23 +206,21 @@ class SparseMatrix
// 2) avoid to allocate too much memory when the matrix is almost empty // 2) avoid to allocate too much memory when the matrix is almost empty
reallocRatio = std::min(std::max(reallocRatio,1.5f),8.f); reallocRatio = std::min(std::max(reallocRatio,1.5f),8.f);
} }
m_data.resize(id+2,reallocRatio); m_data.resize(id+1,reallocRatio);
while ( (id >= startId) && (m_data.index(id) > inner) ) while ( (id > startId) && (m_data.index(id-1) > inner) )
{ {
m_data.index(id+1) = m_data.index(id); m_data.index(id) = m_data.index(id-1);
m_data.value(id+1) = m_data.value(id); m_data.value(id) = m_data.value(id-1);
--id; --id;
} }
m_data.index(id+1) = inner;
return (m_data.value(id+1) = 0);
}
// inline void m_data.index(id) = inner;
return (m_data.value(id) = 0);
}
inline void endFill() inline void endFill()
{ {
// std::cerr << this << " endFill\n";
int size = m_data.size(); int size = m_data.size();
int i = m_outerSize; int i = m_outerSize;
// find the last filled column // find the last filled column