diff options
author | 2014-01-25 19:06:07 +0100 | |
---|---|---|
committer | 2014-01-25 19:06:07 +0100 | |
commit | fef534f52e403e24637209f1ad843111c81122bd (patch) | |
tree | 55d92559b143daffa644e5a3c188b5dbb5be0c23 /Eigen/src/Core | |
parent | d357bbd9c06f4b6088de0a8e47b3e56fdd0b99b3 (diff) |
fix scalar * prod in evaluators unit test
Diffstat (limited to 'Eigen/src/Core')
-rw-r--r-- | Eigen/src/Core/ProductEvaluators.h | 3 | ||||
-rw-r--r-- | Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Eigen/src/Core/ProductEvaluators.h b/Eigen/src/Core/ProductEvaluators.h index 46048882b..2279ec33b 100644 --- a/Eigen/src/Core/ProductEvaluators.h +++ b/Eigen/src/Core/ProductEvaluators.h @@ -156,7 +156,8 @@ struct Assignment<DstXprType, CwiseUnaryOp<internal::scalar_multiple_op<ScalarBi const Product<Lhs,Rhs,DefaultProduct> > SrcXprType; static void run(DstXprType &dst, const SrcXprType &src, const AssignFunc& func) { - call_assignment(dst.noalias(), (src.functor().m_other * src.nestedExpression().lhs()) * src.nestedExpression().rhs(), func); + // TODO use operator* instead of prod() once we have made enough progress + call_assignment(dst.noalias(), prod(src.functor().m_other * src.nestedExpression().lhs(), src.nestedExpression().rhs()), func); } }; diff --git a/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h b/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h index 5c3763909..87bd36bc3 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h @@ -20,7 +20,7 @@ namespace internal { /********************************************************************** * This file implements a general A * B product while * evaluating only one triangular part of the product. -* This is more general version of self adjoint product (C += A A^T) +* This is a more general version of self adjoint product (C += A A^T) * as the level 3 SYRK Blas routine. **********************************************************************/ |