diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-10-08 21:41:53 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-10-08 21:41:53 +0200 |
| commit | c9718514f59844f1811685c6703389fc95195864 (patch) | |
| tree | 254255f5ef3ac54d0154b0c6e2fdd5d728ffe3bb /test/product_notemporary.cpp | |
| parent | 4140ee039d1b9adc7ec0e747e466ee073d239d29 (diff) | |
Fix nesting sub-expression in outer-products
Diffstat (limited to 'test/product_notemporary.cpp')
| -rw-r--r-- | test/product_notemporary.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/test/product_notemporary.cpp b/test/product_notemporary.cpp index 94b5f712d..16f6266f7 100644 --- a/test/product_notemporary.cpp +++ b/test/product_notemporary.cpp @@ -62,7 +62,7 @@ template<typename MatrixType> void product_notemporary(const MatrixType& m) VERIFY_EVALUATION_COUNT( m3.noalias() -= (s1 * m1).template triangularView<Lower>() * m2, 0); VERIFY_EVALUATION_COUNT( rm3.noalias() = (s1 * m1.adjoint()).template triangularView<Upper>() * (m2+m2), 1); VERIFY_EVALUATION_COUNT( rm3.noalias() = (s1 * m1.adjoint()).template triangularView<UnitUpper>() * m2.adjoint(), 0); - + VERIFY_EVALUATION_COUNT( m3.template triangularView<Upper>() = (m1 * m2.adjoint()), 0); VERIFY_EVALUATION_COUNT( m3.template triangularView<Upper>() -= (m1 * m2.adjoint()), 0); @@ -112,6 +112,17 @@ template<typename MatrixType> void product_notemporary(const MatrixType& m) VERIFY_EVALUATION_COUNT( cvres.noalias() = (rm3+rm3) * cv1, 0 ); VERIFY_EVALUATION_COUNT( cvres.noalias() = (m1+m1) * (m1*cv1), 1 ); VERIFY_EVALUATION_COUNT( cvres.noalias() = (rm3+rm3) * (m1*cv1), 1 ); + + // Check outer products + m3 = cv1 * rv1; + VERIFY_EVALUATION_COUNT( m3.noalias() = cv1 * rv1, 0 ); + VERIFY_EVALUATION_COUNT( m3.noalias() = (cv1+cv1) * (rv1+rv1), 1 ); + VERIFY_EVALUATION_COUNT( m3.noalias() = (m1*cv1) * (rv1), 1 ); + VERIFY_EVALUATION_COUNT( m3.noalias() += (m1*cv1) * (rv1), 1 ); + VERIFY_EVALUATION_COUNT( rm3.noalias() = (cv1) * (rv1 * m1), 1 ); + VERIFY_EVALUATION_COUNT( rm3.noalias() -= (cv1) * (rv1 * m1), 1 ); + VERIFY_EVALUATION_COUNT( rm3.noalias() = (m1*cv1) * (rv1 * m1), 2 ); + VERIFY_EVALUATION_COUNT( rm3.noalias() += (m1*cv1) * (rv1 * m1), 2 ); } void test_product_notemporary() |