diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-03-19 02:12:23 -0400 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2010-03-19 02:12:23 -0400 |
| commit | 547269da3560518807efe902bce07d22db03e039 (patch) | |
| tree | 0977e39381ecb056ddbbd3e34efc76f774df009f /Eigen/src/QR/HouseholderQR.h | |
| parent | 9dba86df0b5c1d28a18666003a10f53e59154904 (diff) | |
fix the flags and matrix options, to always have the right RowMajor bit in the vector case
Diffstat (limited to 'Eigen/src/QR/HouseholderQR.h')
| -rw-r--r-- | Eigen/src/QR/HouseholderQR.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Eigen/src/QR/HouseholderQR.h b/Eigen/src/QR/HouseholderQR.h index 42ad94030..c4abc16ff 100644 --- a/Eigen/src/QR/HouseholderQR.h +++ b/Eigen/src/QR/HouseholderQR.h @@ -56,15 +56,13 @@ template<typename _MatrixType> class HouseholderQR ColsAtCompileTime = MatrixType::ColsAtCompileTime, Options = MatrixType::Options, MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime, - MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime, - DiagSizeAtCompileTime = EIGEN_SIZE_MIN(ColsAtCompileTime,RowsAtCompileTime), - MaxDiagSizeAtCompileTime = EIGEN_SIZE_MIN(MaxColsAtCompileTime,MaxRowsAtCompileTime) + MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime }; typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::RealScalar RealScalar; typedef Matrix<Scalar, RowsAtCompileTime, RowsAtCompileTime, ei_traits<MatrixType>::Flags&RowMajorBit ? RowMajor : ColMajor, MaxRowsAtCompileTime, MaxRowsAtCompileTime> MatrixQType; - typedef Matrix<Scalar, DiagSizeAtCompileTime, 1, Options, MaxDiagSizeAtCompileTime, 1> HCoeffsType; - typedef Matrix<Scalar, 1, ColsAtCompileTime, Options, 1, MaxColsAtCompileTime> RowVectorType; + typedef typename ei_plain_diag_type<MatrixType>::type HCoeffsType; + typedef typename ei_plain_row_type<MatrixType>::type RowVectorType; typedef typename HouseholderSequence<MatrixType,HCoeffsType>::ConjugateReturnType HouseholderSequenceType; /** |