diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2010-01-07 21:15:32 +0100 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2010-01-07 21:15:32 +0100 |
| commit | c5d7c9f0def693e77797e6e43cb1fd2e7f8ae2fd (patch) | |
| tree | 3a6367ee5d64f9e9034831a84d2b4cf3c761263c /Eigen/src/Core/products/SelfadjointMatrixMatrix.h | |
| parent | 82ec250a0f9abc11be71e8d0f92dc6f7284b91d0 (diff) | |
remove the Triangular suffix to Upper, Lower, UnitLower, etc,
and remove the respective bit flags
Diffstat (limited to 'Eigen/src/Core/products/SelfadjointMatrixMatrix.h')
| -rw-r--r-- | Eigen/src/Core/products/SelfadjointMatrixMatrix.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Eigen/src/Core/products/SelfadjointMatrixMatrix.h b/Eigen/src/Core/products/SelfadjointMatrixMatrix.h index 35efa752e..ac072e189 100644 --- a/Eigen/src/Core/products/SelfadjointMatrixMatrix.h +++ b/Eigen/src/Core/products/SelfadjointMatrixMatrix.h @@ -368,10 +368,10 @@ struct SelfadjointProductMatrix<Lhs,LhsMode,false,Rhs,RhsMode,false> SelfadjointProductMatrix(const Lhs& lhs, const Rhs& rhs) : Base(lhs,rhs) {} enum { - LhsUpLo = LhsMode&(UpperTriangularBit|LowerTriangularBit), - LhsIsSelfAdjoint = (LhsMode&SelfAdjointBit)==SelfAdjointBit, - RhsUpLo = RhsMode&(UpperTriangularBit|LowerTriangularBit), - RhsIsSelfAdjoint = (RhsMode&SelfAdjointBit)==SelfAdjointBit + LhsUpLo = LhsMode&(Upper|Lower), + LhsIsSelfAdjoint = (LhsMode&SelfAdjoint)==SelfAdjoint, + RhsUpLo = RhsMode&(Upper|Lower), + RhsIsSelfAdjoint = (RhsMode&SelfAdjoint)==SelfAdjoint }; template<typename Dest> void scaleAndAddTo(Dest& dst, Scalar alpha) const @@ -385,12 +385,12 @@ struct SelfadjointProductMatrix<Lhs,LhsMode,false,Rhs,RhsMode,false> * RhsBlasTraits::extractScalarFactor(m_rhs); ei_product_selfadjoint_matrix<Scalar, - EIGEN_LOGICAL_XOR(LhsUpLo==UpperTriangular, + EIGEN_LOGICAL_XOR(LhsUpLo==Upper, ei_traits<Lhs>::Flags &RowMajorBit) ? RowMajor : ColMajor, LhsIsSelfAdjoint, - NumTraits<Scalar>::IsComplex && EIGEN_LOGICAL_XOR(LhsUpLo==UpperTriangular,bool(LhsBlasTraits::NeedToConjugate)), - EIGEN_LOGICAL_XOR(RhsUpLo==UpperTriangular, + NumTraits<Scalar>::IsComplex && EIGEN_LOGICAL_XOR(LhsUpLo==Upper,bool(LhsBlasTraits::NeedToConjugate)), + EIGEN_LOGICAL_XOR(RhsUpLo==Upper, ei_traits<Rhs>::Flags &RowMajorBit) ? RowMajor : ColMajor, RhsIsSelfAdjoint, - NumTraits<Scalar>::IsComplex && EIGEN_LOGICAL_XOR(RhsUpLo==UpperTriangular,bool(RhsBlasTraits::NeedToConjugate)), + NumTraits<Scalar>::IsComplex && EIGEN_LOGICAL_XOR(RhsUpLo==Upper,bool(RhsBlasTraits::NeedToConjugate)), ei_traits<Dest>::Flags&RowMajorBit ? RowMajor : ColMajor> ::run( lhs.rows(), rhs.cols(), // sizes |