diff options
author | Gael Guennebaud <g.gael@free.fr> | 2009-07-21 16:58:35 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2009-07-21 16:58:35 +0200 |
commit | d6627d540e6a8651ccd8ce4a4520b70fe5def870 (patch) | |
tree | 0b33c593046a5aa7c1a76c42cdd749a3938870ba /test/product_selfadjoint.cpp | |
parent | afa8f2ca952e52201b36813b848aa7a68fca70e9 (diff) |
* refactoring of the matrix product into multiple small kernels
* started an efficient selfadjoint matrix * general matrix product
based on the generic kernels ( => need a very little LOC)
Diffstat (limited to 'test/product_selfadjoint.cpp')
-rw-r--r-- | test/product_selfadjoint.cpp | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/test/product_selfadjoint.cpp b/test/product_selfadjoint.cpp index 29fbf11bf..814672696 100644 --- a/test/product_selfadjoint.cpp +++ b/test/product_selfadjoint.cpp @@ -46,9 +46,9 @@ template<typename MatrixType> void product_selfadjoint(const MatrixType& m) Scalar s1 = ei_random<Scalar>(), s2 = ei_random<Scalar>(), s3 = ei_random<Scalar>(); - + m1 = m1.adjoint()*m1; - + // lower m2.setZero(); m2.template triangularView<LowerTriangular>() = m1; @@ -68,7 +68,7 @@ template<typename MatrixType> void product_selfadjoint(const MatrixType& m) m2 = m1.template triangularView<LowerTriangular>(); m2.template selfadjointView<LowerTriangular>().rank2update(v1,v2); VERIFY_IS_APPROX(m2, (m1 + v1 * v2.adjoint()+ v2 * v1.adjoint()).template triangularView<LowerTriangular>().toDense()); - + m2 = m1.template triangularView<UpperTriangular>(); m2.template selfadjointView<UpperTriangular>().rank2update(-v1,s2*v2,s3); VERIFY_IS_APPROX(m2, (m1 + (-s2*s3) * (v1 * v2.adjoint()+ v2 * v1.adjoint())).template triangularView<UpperTriangular>().toDense()); @@ -99,4 +99,24 @@ void test_product_selfadjoint() CALL_SUBTEST( product_selfadjoint(Matrix<float,Dynamic,Dynamic,RowMajor>(17,17)) ); CALL_SUBTEST( product_selfadjoint(Matrix<std::complex<double>,Dynamic,Dynamic,RowMajor>(19, 19)) ); } + + for(int i = 0; i < g_repeat ; i++) + { + int size = ei_random<int>(10,1024); + int cols = ei_random<int>(10,320); + MatrixXf A = MatrixXf::Random(size,size); + MatrixXf B = MatrixXf::Random(size,cols); + MatrixXf C = MatrixXf::Random(size,cols); + MatrixXf R = MatrixXf::Random(size,cols); + A = (A+A.transpose()).eval(); + + R = C + (A * B).eval(); + + A.corner(TopRight,size-1,size-1).triangularView<UpperTriangular>().setZero(); + + ei_product_selfadjoint_matrix<float,ColMajor,LowerTriangular,false,false> + (size, A.data(), A.stride(), B.data(), B.stride(), false, B.cols(), C.data(), C.stride(), 1); +// std::cerr << A << "\n\n" << C << "\n\n" << R << "\n\n"; + VERIFY_IS_APPROX(C,R); + } } |