GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-04-21 09:09:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug #1343: fix compilation regression in array = matrix_product

Browse Source
This commit is contained in:
Gael Guennebaud 2016-11-18 10:09:33 +01:00
parent a6a3fd0703
commit cebff7e3a2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/Core/GeneralProduct.h
View File

@ -264,7 +264,7 @@ template<> struct gemv_dense_selector<OnTheRight,ColMajor,true>
if (!evalToDest) if (!evalToDest)
{ {
if(!alphaIsCompatible) if(!alphaIsCompatible)
dest += actualAlpha * MappedDest(actualDestPtr, dest.size()); dest.matrix() += actualAlpha * MappedDest(actualDestPtr, dest.size());
else else
dest = MappedDest(actualDestPtr, dest.size()); dest = MappedDest(actualDestPtr, dest.size());
} }

10
test/product_extra.cpp
View File

@ -98,6 +98,16 @@ template<typename MatrixType> void product_extra(const MatrixType& m)
// regression test // regression test
MatrixType tmp = m1 * m1.adjoint() * s1; MatrixType tmp = m1 * m1.adjoint() * s1;
VERIFY_IS_APPROX(tmp, m1 * m1.adjoint() * s1); VERIFY_IS_APPROX(tmp, m1 * m1.adjoint() * s1);
// regression test for bug 1343, assignment to arrays
Array<Scalar,Dynamic,1> a1 = m1 * vc2;
VERIFY_IS_APPROX(a1.matrix(),m1*vc2);
Array<Scalar,Dynamic,1> a2 = s1 * (m1 * vc2);
VERIFY_IS_APPROX(a2.matrix(),s1*m1*vc2);
Array<Scalar,1,Dynamic> a3 = v1 * m1;
VERIFY_IS_APPROX(a3.matrix(),v1*m1);
Array<Scalar,Dynamic,Dynamic> a4 = m1 * m2.adjoint();
VERIFY_IS_APPROX(a4.matrix(),m1*m2.adjoint());
} }
// Regression test for bug reported at http://forum.kde.org/viewtopic.php?f=74&t=96947 // Regression test for bug reported at http://forum.kde.org/viewtopic.php?f=74&t=96947