devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Matrix-Market: fix perf issue and infinite loop

Browse Source
This commit is contained in:
Gael Guennebaud
2012-06-15 09:07:13 +02:00
parent c858fb353f
commit 3fd2beebc8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
unsupported/Eigen/src/SparseExtra/MarketIO.h
View File

@@ -156,6 +156,9 @@ bool loadMarket(SparseMatrixType& mat, const std::string& filename)
char buffer[maxBuffersize];
bool readsizes = false;
typedef Triplet<Scalar,int> T;
std::vector<T> elements;
int M(-1), N(-1), NNZ(-1);
int count = 0;
@@ -186,13 +189,13 @@ bool loadMarket(SparseMatrixType& mat, const std::string& filename)
if( internal::GetMarketLine(line, M, N, i, j, value) )
{
++ count;
mat.insert(i,j) = value;
elements.push_back(T(i,j,value));
}
else
std::cerr << "Invalid read: " << i << "," << j << "\n";
}
}
mat.makeCompressed();
mat.setFromTriplets(elements.begin(), elements.end());
if(count!=NNZ)
std::cerr << count << "!=" << NNZ << "\n";