diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-10-24 09:31:33 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-10-24 09:31:33 +0200 |
commit | 70df09b76d1a13a55de1ebe6834ee359f403be89 (patch) | |
tree | 6a9a6d69ed28fc352bcdadda01af6a749c9fea61 /unsupported/test/sparse_extra.cpp | |
parent | a2d414f56876c5fa4fbaebfc90c212e9d1830148 (diff) |
move DynamicSparseMatrix to SparseExtra
Diffstat (limited to 'unsupported/test/sparse_extra.cpp')
-rw-r--r-- | unsupported/test/sparse_extra.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/unsupported/test/sparse_extra.cpp b/unsupported/test/sparse_extra.cpp index b1fd481e8..e8c584640 100644 --- a/unsupported/test/sparse_extra.cpp +++ b/unsupported/test/sparse_extra.cpp @@ -22,7 +22,10 @@ // License and a copy of the GNU General Public License along with // Eigen. If not, see <http://www.gnu.org/licenses/>. -#include "sparse.h" +//#include "sparse.h" +// import basic and product tests for deprectaed DynamicSparseMatrix +#include "sparse_basic.cpp" +#include "sparse_product.cpp" #include <Eigen/SparseExtra> template<typename SetterType,typename DenseType, typename Scalar, int Options> @@ -145,10 +148,16 @@ template<typename SparseMatrixType> void sparse_extra(const SparseMatrixType& re void test_sparse_extra() { for(int i = 0; i < g_repeat; i++) { + int s = Eigen::internal::random<int>(1,50); CALL_SUBTEST_1( sparse_extra(SparseMatrix<double>(8, 8)) ); - CALL_SUBTEST_2( sparse_extra(SparseMatrix<std::complex<double> >(16, 16)) ); - CALL_SUBTEST_1( sparse_extra(SparseMatrix<double>(33, 33)) ); + CALL_SUBTEST_2( sparse_extra(SparseMatrix<std::complex<double> >(s, s)) ); + CALL_SUBTEST_1( sparse_extra(SparseMatrix<double>(s, s)) ); - CALL_SUBTEST_3( sparse_extra(DynamicSparseMatrix<double>(8, 8)) ); + CALL_SUBTEST_3( sparse_extra(DynamicSparseMatrix<double>(s, s)) ); +// CALL_SUBTEST_3(( sparse_basic(DynamicSparseMatrix<double>(s, s)) )); +// CALL_SUBTEST_3(( sparse_basic(DynamicSparseMatrix<double,ColMajor,long int>(s, s)) )); + + CALL_SUBTEST_3( (sparse_product<DynamicSparseMatrix<float, ColMajor> >()) ); + CALL_SUBTEST_3( (sparse_product<DynamicSparseMatrix<float, RowMajor> >()) ); } } |