aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Christoph Hertzberg <chtz@informatik.uni-bremen.de>2018-04-13 20:36:58 +0200
committerGravatar Christoph Hertzberg <chtz@informatik.uni-bremen.de>2018-04-13 20:36:58 +0200
commitc8b19702bc25b64b5ac9ab8f590a4706c3f46208 (patch)
treebc71edd7ff43a28fbefc45b08422f2918ce9fffa
parent2cbb00b18ee3d02d3b747bcb1775d7f851e46d7e (diff)
Limit test size for sparse Cholesky solvers to EIGEN_TEST_MAX_SIZE
-rw-r--r--test/simplicial_cholesky.cpp4
-rw-r--r--test/sparse_solver.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/test/simplicial_cholesky.cpp b/test/simplicial_cholesky.cpp
index 649c817b4..5bb1e0d6c 100644
--- a/test/simplicial_cholesky.cpp
+++ b/test/simplicial_cholesky.cpp
@@ -35,8 +35,8 @@ template<typename T, typename I> void test_simplicial_cholesky_T()
check_sparse_spd_determinant(ldlt_colmajor_lower_amd);
check_sparse_spd_determinant(ldlt_colmajor_upper_amd);
- check_sparse_spd_solving(ldlt_colmajor_lower_nat, 300, 1000);
- check_sparse_spd_solving(ldlt_colmajor_upper_nat, 300, 1000);
+ check_sparse_spd_solving(ldlt_colmajor_lower_nat, (std::min)(300,EIGEN_TEST_MAX_SIZE), 1000);
+ check_sparse_spd_solving(ldlt_colmajor_upper_nat, (std::min)(300,EIGEN_TEST_MAX_SIZE), 1000);
}
void test_simplicial_cholesky()
diff --git a/test/sparse_solver.h b/test/sparse_solver.h
index 5145bc3eb..19416ed5d 100644
--- a/test/sparse_solver.h
+++ b/test/sparse_solver.h
@@ -266,7 +266,7 @@ std::string solver_stats(const SparseSolverBase<Derived> &/*solver*/)
}
#endif
-template<typename Solver> void check_sparse_spd_solving(Solver& solver, int maxSize = 300, int maxRealWorldSize = 100000)
+template<typename Solver> void check_sparse_spd_solving(Solver& solver, int maxSize = (std::min)(300,EIGEN_TEST_MAX_SIZE), int maxRealWorldSize = 100000)
{
typedef typename Solver::MatrixType Mat;
typedef typename Mat::Scalar Scalar;