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

bugfix and compilation fix in ProductBase

Browse Source
This commit is contained in:
Gael Guennebaud 2009-08-15 10:55:11 +02:00
parent bff4238d15
commit 0da31a6e1d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Eigen/src/Core/ProductBase.h
View File

@ -115,7 +115,7 @@ class ProductBase : public MatrixBase<Derived>
{ {
PlainMatrixType res(rows(), cols()); PlainMatrixType res(rows(), cols());
res.setZero(); res.setZero();
evalTo(res); derived().evalTo(res);
return res; return res;
} }
@ -148,12 +148,14 @@ class ScaledProduct;
// functions of ProductBase, because, otherwise we would have to // functions of ProductBase, because, otherwise we would have to
// define all overloads defined in MatrixBase. Furthermore, Using // define all overloads defined in MatrixBase. Furthermore, Using
// "using Base::operator*" would not work with MSVC. // "using Base::operator*" would not work with MSVC.
template<typename Derived,typename Lhs,typename Rhs> //
const ScaledProduct<Derived> operator*(const ProductBase<Derived,Lhs,Rhs>& prod, typename Derived::Scalar x) // Also note that here we accept any type which can be converted to Derived::Scalar.
template<typename Derived,typename Lhs,typename Rhs,typename Scalar>
const ScaledProduct<Derived> operator*(const ProductBase<Derived,Lhs,Rhs>& prod, Scalar x)
{ return ScaledProduct<Derived>(prod.derived(), x); } { return ScaledProduct<Derived>(prod.derived(), x); }
template<typename Derived,typename Lhs,typename Rhs> template<typename Derived,typename Lhs,typename Rhs,typename Scalar>
const ScaledProduct<Derived> operator*(typename Derived::Scalar x,const ProductBase<Derived,Lhs,Rhs>& prod) const ScaledProduct<Derived> operator*(Scalar x,const ProductBase<Derived,Lhs,Rhs>& prod)
{ return ScaledProduct<Derived>(prod.derived(), x); } { return ScaledProduct<Derived>(prod.derived(), x); }
template<typename NestedProduct> template<typename NestedProduct>
@ -176,7 +178,7 @@ class ScaledProduct
typedef typename Base::Scalar Scalar; typedef typename Base::Scalar Scalar;
// EIGEN_PRODUCT_PUBLIC_INTERFACE(ScaledProduct) // EIGEN_PRODUCT_PUBLIC_INTERFACE(ScaledProduct)
ScaledProduct(const NestedProduct& prod, Scalar& x) ScaledProduct(const NestedProduct& prod, Scalar x)
: Base(prod.lhs(),prod.rhs()), m_prod(prod), m_alpha(x) {} : Base(prod.lhs(),prod.rhs()), m_prod(prod), m_alpha(x) {}
template<typename Dest> template<typename Dest>