diff options
author | Gael Guennebaud <g.gael@free.fr> | 2010-06-13 23:29:44 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2010-06-13 23:29:44 +0200 |
commit | 9ffc0f6975a6dec86b8e9eacc0af019124d20d43 (patch) | |
tree | a6e0aca72a2430574a273c5c8648b01551b6e299 /test/sparse_solvers.cpp | |
parent | f15961321079854b37bdb33ad82e30175dc093fd (diff) |
an attempt to fix 133
Diffstat (limited to 'test/sparse_solvers.cpp')
-rw-r--r-- | test/sparse_solvers.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/test/sparse_solvers.cpp b/test/sparse_solvers.cpp index ea8aee718..9d30af146 100644 --- a/test/sparse_solvers.cpp +++ b/test/sparse_solvers.cpp @@ -115,9 +115,11 @@ template<typename Scalar> void sparse_solvers(int rows, int cols) DenseVector b = DenseVector::Random(cols); DenseVector refX(cols), x(cols); - initSPD(density, refMat2, m2); + initSparse<Scalar>(density, refMat2, m2, ForceNonZeroDiag|MakeLowerTriangular, 0, 0); + for(int i=0; i<rows; ++i) + m2.coeffRef(i,i) = refMat2(i,i) = ei_abs(ei_real(refMat2(i,i))); - refX = refMat2.llt().solve(b); + refX = refMat2.template selfadjointView<Lower>().llt().solve(b); if (!NumTraits<Scalar>::IsComplex) { x = b; @@ -160,8 +162,7 @@ template<typename Scalar> void sparse_solvers(int rows, int cols) for(int i=0; i<rows; ++i) m2.coeffRef(i,i) = refMat2(i,i) = ei_abs(ei_real(refMat2(i,i))); - refX = refMat2.template selfadjointView<Upper>().llt().solve(b); - // FIXME use LLT to compute the reference because LDLT seems to fail with large matrices + refX = refMat2.template selfadjointView<Upper>().ldlt().solve(b); typedef SparseMatrix<Scalar,Upper|SelfAdjoint> SparseSelfAdjointMatrix; x = b; SparseLDLT<SparseSelfAdjointMatrix> ldlt(m2); @@ -170,6 +171,7 @@ template<typename Scalar> void sparse_solvers(int rows, int cols) else std::cerr << "warning LDLT failed\n"; + VERIFY_IS_APPROX(refMat2.template selfadjointView<Upper>() * x, b); VERIFY(refX.isApprox(x,test_precision<Scalar>()) && "LDLT: default"); } @@ -242,7 +244,8 @@ void test_sparse_solvers() { for(int i = 0; i < g_repeat; i++) { CALL_SUBTEST_1(sparse_solvers<double>(8, 8) ); - CALL_SUBTEST_2(sparse_solvers<std::complex<double> >(16, 16) ); - CALL_SUBTEST_1(sparse_solvers<double>(100, 100) ); + int s = ei_random<int>(1,300); + CALL_SUBTEST_2(sparse_solvers<std::complex<double> >(s,s) ); + CALL_SUBTEST_1(sparse_solvers<double>(s,s) ); } } |