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

Fixed bug #84.

Browse Source
This commit is contained in:
Hauke Heibel 2010-10-21 10:13:17 +02:00
parent 9bbaff6b41
commit ba86d3ef65
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
Eigen/src/Core/util/XprHelper.h
View File

@ -421,30 +421,53 @@ template <typename A> struct ei_promote_storage_type<A,A>
typedef A ret; typedef A ret;
}; };
/** \internal gives the plain matrix type to store a row/column/diagonal of a matrix type. /** \internal gives the plain matrix or array type to store a row/column/diagonal of a matrix type.
* \param Scalar optional parameter allowing to pass a different scalar type than the one of the MatrixType. * \param Scalar optional parameter allowing to pass a different scalar type than the one of the MatrixType.
*/ */
template<typename MatrixType, typename Scalar = typename MatrixType::Scalar> template<typename ExpressionType, typename Scalar = typename ExpressionType::Scalar>
struct ei_plain_row_type struct ei_plain_row_type
{ {
typedef Matrix<Scalar, 1, MatrixType::ColsAtCompileTime, typedef Matrix<Scalar, 1, ExpressionType::ColsAtCompileTime,
MatrixType::PlainObject::Options | RowMajor, 1, MatrixType::MaxColsAtCompileTime> type; ExpressionType::PlainObject::Options | RowMajor, 1, ExpressionType::MaxColsAtCompileTime> MatrixRowType;
typedef Array<Scalar, 1, ExpressionType::ColsAtCompileTime,
ExpressionType::PlainObject::Options | RowMajor, 1, ExpressionType::MaxColsAtCompileTime> ArrayRowType;
typedef typename ei_meta_if<
ei_is_same_type< typename ei_traits<ExpressionType>::XprKind, MatrixXpr >::ret,
MatrixRowType,
ArrayRowType
>::ret type;
}; };
template<typename MatrixType, typename Scalar = typename MatrixType::Scalar> template<typename ExpressionType, typename Scalar = typename ExpressionType::Scalar>
struct ei_plain_col_type struct ei_plain_col_type
{ {
typedef Matrix<Scalar, MatrixType::RowsAtCompileTime, 1, typedef Matrix<Scalar, ExpressionType::RowsAtCompileTime, 1,
MatrixType::PlainObject::Options & ~RowMajor, MatrixType::MaxRowsAtCompileTime, 1> type; ExpressionType::PlainObject::Options & ~RowMajor, ExpressionType::MaxRowsAtCompileTime, 1> MatrixColType;
typedef Array<Scalar, ExpressionType::RowsAtCompileTime, 1,
ExpressionType::PlainObject::Options & ~RowMajor, ExpressionType::MaxRowsAtCompileTime, 1> ArrayColType;
typedef typename ei_meta_if<
ei_is_same_type< typename ei_traits<ExpressionType>::XprKind, MatrixXpr >::ret,
MatrixColType,
ArrayColType
>::ret type;
}; };
template<typename MatrixType, typename Scalar = typename MatrixType::Scalar> template<typename ExpressionType, typename Scalar = typename ExpressionType::Scalar>
struct ei_plain_diag_type struct ei_plain_diag_type
{ {
enum { diag_size = EIGEN_SIZE_MIN_PREFER_DYNAMIC(MatrixType::RowsAtCompileTime, MatrixType::ColsAtCompileTime), enum { diag_size = EIGEN_SIZE_MIN_PREFER_DYNAMIC(ExpressionType::RowsAtCompileTime, ExpressionType::ColsAtCompileTime),
max_diag_size = EIGEN_SIZE_MIN_PREFER_FIXED(MatrixType::MaxRowsAtCompileTime, MatrixType::MaxColsAtCompileTime) max_diag_size = EIGEN_SIZE_MIN_PREFER_FIXED(ExpressionType::MaxRowsAtCompileTime, ExpressionType::MaxColsAtCompileTime)
}; };
typedef Matrix<Scalar, diag_size, 1, MatrixType::PlainObject::Options & ~RowMajor, max_diag_size, 1> type; typedef Matrix<Scalar, diag_size, 1, ExpressionType::PlainObject::Options & ~RowMajor, max_diag_size, 1> MatrixDiagType;
typedef Array<Scalar, diag_size, 1, ExpressionType::PlainObject::Options & ~RowMajor, max_diag_size, 1> ArrayDiagType;
typedef typename ei_meta_if<
ei_is_same_type< typename ei_traits<ExpressionType>::XprKind, MatrixXpr >::ret,
MatrixDiagType,
ArrayDiagType
>::ret type;
}; };
#endif // EIGEN_XPRHELPER_H #endif // EIGEN_XPRHELPER_H