From 6357fd68da62bafe2459fe7c4c07c7dd8d360acf Mon Sep 17 00:00:00 2001 From: Christoph Hertzberg Date: Sun, 17 Mar 2013 13:55:31 +0100 Subject: Patch by Kolja Brix that fixes bug #565 and adds a testcase to verify that. --- unsupported/test/kronecker_product.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'unsupported/test/kronecker_product.cpp') diff --git a/unsupported/test/kronecker_product.cpp b/unsupported/test/kronecker_product.cpp index 9f2915ecf..108bf6fde 100644 --- a/unsupported/test/kronecker_product.cpp +++ b/unsupported/test/kronecker_product.cpp @@ -86,28 +86,36 @@ void check_sparse_kronecker_product(const MatrixType& ab) void test_kronecker_product() { // DM = dense matrix; SM = sparse matrix + Matrix DM_a; - MatrixXd DM_b(3,2); SparseMatrix SM_a(2,3); - SparseMatrix SM_b(3,2); SM_a.insert(0,0) = DM_a.coeffRef(0,0) = -0.4461540300782201; SM_a.insert(0,1) = DM_a.coeffRef(0,1) = -0.8057364375283049; SM_a.insert(0,2) = DM_a.coeffRef(0,2) = 0.3896572459516341; SM_a.insert(1,0) = DM_a.coeffRef(1,0) = -0.9076572187376921; SM_a.insert(1,1) = DM_a.coeffRef(1,1) = 0.6469156566545853; SM_a.insert(1,2) = DM_a.coeffRef(1,2) = -0.3658010398782789; + + MatrixXd DM_b(3,2); + SparseMatrix SM_b(3,2); SM_b.insert(0,0) = DM_b.coeffRef(0,0) = 0.9004440976767099; SM_b.insert(0,1) = DM_b.coeffRef(0,1) = -0.2368830858139832; SM_b.insert(1,0) = DM_b.coeffRef(1,0) = -0.9311078389941825; SM_b.insert(1,1) = DM_b.coeffRef(1,1) = 0.5310335762980047; SM_b.insert(2,0) = DM_b.coeffRef(2,0) = -0.1225112806872035; SM_b.insert(2,1) = DM_b.coeffRef(2,1) = 0.5903998022741264; + SparseMatrix SM_row_a(SM_a), SM_row_b(SM_b); // test kroneckerProduct(DM_block,DM,DM_fixedSize) Matrix DM_fix_ab = kroneckerProduct(DM_a.topLeftCorner<2,3>(),DM_b); + CALL_SUBTEST(check_kronecker_product(DM_fix_ab)); + for(unsigned int i=0;i(2,5) = kroneckerProduct(DM_a,DM_b); @@ -152,6 +160,7 @@ void test_kronecker_product() SM_a.insert(0,3) = -0.2; SM_a.insert(2,4) = 0.3; SM_a.finalize(); + SM_b.insert(0,0) = 0.4; SM_b.insert(2,1) = -0.5; SM_b.finalize(); -- cgit v1.2.3