diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2011-06-07 11:28:16 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2011-06-07 11:28:16 +0200 |
| commit | 91fe1507d1a06d84c9ac8d913f080e30f760375b (patch) | |
| tree | cd9265459abf0c0fd1d6614c6d1fe0cfb6a987d8 /test/sparse_basic.cpp | |
| parent | 421ece38e1995ec4df12213d6fd567fa18222cca (diff) | |
Sparse: more fixes regarding long int as index type
Diffstat (limited to 'test/sparse_basic.cpp')
| -rw-r--r-- | test/sparse_basic.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/test/sparse_basic.cpp b/test/sparse_basic.cpp index 7910bbf8f..d8ff06a33 100644 --- a/test/sparse_basic.cpp +++ b/test/sparse_basic.cpp @@ -191,8 +191,8 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re DenseMatrix refMat2 = DenseMatrix::Zero(rows, rows); SparseMatrixType m2(rows, rows); initSparse<Scalar>(density, refMat2, m2); - int j0 = internal::random(0,rows-1); - int j1 = internal::random(0,rows-1); + int j0 = internal::random<int>(0,rows-1); + int j1 = internal::random<int>(0,rows-1); VERIFY_IS_APPROX(m2.innerVector(j0), refMat2.col(j0)); VERIFY_IS_APPROX(m2.innerVector(j0)+m2.innerVector(j1), refMat2.col(j0)+refMat2.col(j1)); //m2.innerVector(j0) = 2*m2.innerVector(j1); @@ -205,8 +205,8 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re DenseMatrix refMat2 = DenseMatrix::Zero(rows, rows); SparseMatrixType m2(rows, rows); initSparse<Scalar>(density, refMat2, m2); - int j0 = internal::random(0,rows-2); - int j1 = internal::random(0,rows-2); + int j0 = internal::random<int>(0,rows-2); + int j1 = internal::random<int>(0,rows-2); int n0 = internal::random<int>(1,rows-std::max(j0,j1)); VERIFY_IS_APPROX(m2.innerVectors(j0,n0), refMat2.block(0,j0,rows,n0)); VERIFY_IS_APPROX(m2.innerVectors(j0,n0)+m2.innerVectors(j1,n0), @@ -274,10 +274,13 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re void test_sparse_basic() { for(int i = 0; i < g_repeat; i++) { - CALL_SUBTEST_1( sparse_basic(SparseMatrix<double>(8, 8)) ); - CALL_SUBTEST_2( sparse_basic(SparseMatrix<std::complex<double> >(16, 16)) ); - CALL_SUBTEST_1( sparse_basic(SparseMatrix<double>(33, 33)) ); + int s = Eigen::internal::random<int>(1,50); + CALL_SUBTEST_1(( sparse_basic(SparseMatrix<double>(8, 8)) )); + CALL_SUBTEST_2(( sparse_basic(SparseMatrix<std::complex<double> >(s, s)) )); + CALL_SUBTEST_1(( sparse_basic(SparseMatrix<double>(s, s)) )); + CALL_SUBTEST_1(( sparse_basic(SparseMatrix<double,ColMajor,long int>(s, s)) )); - CALL_SUBTEST_3( sparse_basic(DynamicSparseMatrix<double>(8, 8)) ); + CALL_SUBTEST_3(( sparse_basic(DynamicSparseMatrix<double>(s, s)) )); + CALL_SUBTEST_3(( sparse_basic(DynamicSparseMatrix<double,ColMajor,long int>(s, s)) )); } } |