mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
bug #86 : use internal:: namespace instead of ei_ prefix
This commit is contained in:
@@ -25,11 +25,13 @@
|
||||
#ifndef EIGEN_MISC_IMAGE_H
|
||||
#define EIGEN_MISC_IMAGE_H
|
||||
|
||||
/** \class ei_image_retval_base
|
||||
namespace internal {
|
||||
|
||||
/** \class image_retval_base
|
||||
*
|
||||
*/
|
||||
template<typename DecompositionType>
|
||||
struct ei_traits<ei_image_retval_base<DecompositionType> >
|
||||
struct traits<image_retval_base<DecompositionType> >
|
||||
{
|
||||
typedef typename DecompositionType::MatrixType MatrixType;
|
||||
typedef Matrix<
|
||||
@@ -43,15 +45,15 @@ struct ei_traits<ei_image_retval_base<DecompositionType> >
|
||||
> ReturnType;
|
||||
};
|
||||
|
||||
template<typename _DecompositionType> struct ei_image_retval_base
|
||||
: public ReturnByValue<ei_image_retval_base<_DecompositionType> >
|
||||
template<typename _DecompositionType> struct image_retval_base
|
||||
: public ReturnByValue<image_retval_base<_DecompositionType> >
|
||||
{
|
||||
typedef _DecompositionType DecompositionType;
|
||||
typedef typename DecompositionType::MatrixType MatrixType;
|
||||
typedef ReturnByValue<ei_image_retval_base> Base;
|
||||
typedef ReturnByValue<image_retval_base> Base;
|
||||
typedef typename Base::Index Index;
|
||||
|
||||
ei_image_retval_base(const DecompositionType& dec, const MatrixType& originalMatrix)
|
||||
image_retval_base(const DecompositionType& dec, const MatrixType& originalMatrix)
|
||||
: m_dec(dec), m_rank(dec.rank()),
|
||||
m_cols(m_rank == 0 ? 1 : m_rank),
|
||||
m_originalMatrix(originalMatrix)
|
||||
@@ -65,7 +67,7 @@ template<typename _DecompositionType> struct ei_image_retval_base
|
||||
|
||||
template<typename Dest> inline void evalTo(Dest& dst) const
|
||||
{
|
||||
static_cast<const ei_image_retval<DecompositionType>*>(this)->evalTo(dst);
|
||||
static_cast<const image_retval<DecompositionType>*>(this)->evalTo(dst);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -74,18 +76,20 @@ template<typename _DecompositionType> struct ei_image_retval_base
|
||||
const MatrixType& m_originalMatrix;
|
||||
};
|
||||
|
||||
} // end namespace internal
|
||||
|
||||
#define EIGEN_MAKE_IMAGE_HELPERS(DecompositionType) \
|
||||
typedef typename DecompositionType::MatrixType MatrixType; \
|
||||
typedef typename MatrixType::Scalar Scalar; \
|
||||
typedef typename MatrixType::RealScalar RealScalar; \
|
||||
typedef typename MatrixType::Index Index; \
|
||||
typedef ei_image_retval_base<DecompositionType> Base; \
|
||||
typedef Eigen::internal::image_retval_base<DecompositionType> Base; \
|
||||
using Base::dec; \
|
||||
using Base::originalMatrix; \
|
||||
using Base::rank; \
|
||||
using Base::rows; \
|
||||
using Base::cols; \
|
||||
ei_image_retval(const DecompositionType& dec, const MatrixType& originalMatrix) \
|
||||
image_retval(const DecompositionType& dec, const MatrixType& originalMatrix) \
|
||||
: Base(dec, originalMatrix) {}
|
||||
|
||||
#endif // EIGEN_MISC_IMAGE_H
|
||||
|
||||
@@ -25,11 +25,13 @@
|
||||
#ifndef EIGEN_MISC_KERNEL_H
|
||||
#define EIGEN_MISC_KERNEL_H
|
||||
|
||||
/** \class ei_kernel_retval_base
|
||||
namespace internal {
|
||||
|
||||
/** \class kernel_retval_base
|
||||
*
|
||||
*/
|
||||
template<typename DecompositionType>
|
||||
struct ei_traits<ei_kernel_retval_base<DecompositionType> >
|
||||
struct traits<kernel_retval_base<DecompositionType> >
|
||||
{
|
||||
typedef typename DecompositionType::MatrixType MatrixType;
|
||||
typedef Matrix<
|
||||
@@ -45,14 +47,14 @@ struct ei_traits<ei_kernel_retval_base<DecompositionType> >
|
||||
> ReturnType;
|
||||
};
|
||||
|
||||
template<typename _DecompositionType> struct ei_kernel_retval_base
|
||||
: public ReturnByValue<ei_kernel_retval_base<_DecompositionType> >
|
||||
template<typename _DecompositionType> struct kernel_retval_base
|
||||
: public ReturnByValue<kernel_retval_base<_DecompositionType> >
|
||||
{
|
||||
typedef _DecompositionType DecompositionType;
|
||||
typedef ReturnByValue<ei_kernel_retval_base> Base;
|
||||
typedef ReturnByValue<kernel_retval_base> Base;
|
||||
typedef typename Base::Index Index;
|
||||
|
||||
ei_kernel_retval_base(const DecompositionType& dec)
|
||||
kernel_retval_base(const DecompositionType& dec)
|
||||
: m_dec(dec),
|
||||
m_rank(dec.rank()),
|
||||
m_cols(m_rank==dec.cols() ? 1 : dec.cols() - m_rank)
|
||||
@@ -65,7 +67,7 @@ template<typename _DecompositionType> struct ei_kernel_retval_base
|
||||
|
||||
template<typename Dest> inline void evalTo(Dest& dst) const
|
||||
{
|
||||
static_cast<const ei_kernel_retval<DecompositionType>*>(this)->evalTo(dst);
|
||||
static_cast<const kernel_retval<DecompositionType>*>(this)->evalTo(dst);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -73,16 +75,18 @@ template<typename _DecompositionType> struct ei_kernel_retval_base
|
||||
Index m_rank, m_cols;
|
||||
};
|
||||
|
||||
} // end namespace internal
|
||||
|
||||
#define EIGEN_MAKE_KERNEL_HELPERS(DecompositionType) \
|
||||
typedef typename DecompositionType::MatrixType MatrixType; \
|
||||
typedef typename MatrixType::Scalar Scalar; \
|
||||
typedef typename MatrixType::RealScalar RealScalar; \
|
||||
typedef typename MatrixType::Index Index; \
|
||||
typedef ei_kernel_retval_base<DecompositionType> Base; \
|
||||
typedef Eigen::internal::kernel_retval_base<DecompositionType> Base; \
|
||||
using Base::dec; \
|
||||
using Base::rank; \
|
||||
using Base::rows; \
|
||||
using Base::cols; \
|
||||
ei_kernel_retval(const DecompositionType& dec) : Base(dec) {}
|
||||
kernel_retval(const DecompositionType& dec) : Base(dec) {}
|
||||
|
||||
#endif // EIGEN_MISC_KERNEL_H
|
||||
|
||||
@@ -25,11 +25,13 @@
|
||||
#ifndef EIGEN_MISC_SOLVE_H
|
||||
#define EIGEN_MISC_SOLVE_H
|
||||
|
||||
/** \class ei_solve_retval_base
|
||||
namespace internal {
|
||||
|
||||
/** \class solve_retval_base
|
||||
*
|
||||
*/
|
||||
template<typename DecompositionType, typename Rhs>
|
||||
struct ei_traits<ei_solve_retval_base<DecompositionType, Rhs> >
|
||||
struct traits<solve_retval_base<DecompositionType, Rhs> >
|
||||
{
|
||||
typedef typename DecompositionType::MatrixType MatrixType;
|
||||
typedef Matrix<typename Rhs::Scalar,
|
||||
@@ -40,15 +42,15 @@ struct ei_traits<ei_solve_retval_base<DecompositionType, Rhs> >
|
||||
Rhs::MaxColsAtCompileTime> ReturnType;
|
||||
};
|
||||
|
||||
template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base
|
||||
: public ReturnByValue<ei_solve_retval_base<_DecompositionType, Rhs> >
|
||||
template<typename _DecompositionType, typename Rhs> struct solve_retval_base
|
||||
: public ReturnByValue<solve_retval_base<_DecompositionType, Rhs> >
|
||||
{
|
||||
typedef typename ei_cleantype<typename Rhs::Nested>::type RhsNestedCleaned;
|
||||
typedef typename cleantype<typename Rhs::Nested>::type RhsNestedCleaned;
|
||||
typedef _DecompositionType DecompositionType;
|
||||
typedef ReturnByValue<ei_solve_retval_base> Base;
|
||||
typedef ReturnByValue<solve_retval_base> Base;
|
||||
typedef typename Base::Index Index;
|
||||
|
||||
ei_solve_retval_base(const DecompositionType& dec, const Rhs& rhs)
|
||||
solve_retval_base(const DecompositionType& dec, const Rhs& rhs)
|
||||
: m_dec(dec), m_rhs(rhs)
|
||||
{}
|
||||
|
||||
@@ -59,7 +61,7 @@ template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base
|
||||
|
||||
template<typename Dest> inline void evalTo(Dest& dst) const
|
||||
{
|
||||
static_cast<const ei_solve_retval<DecompositionType,Rhs>*>(this)->evalTo(dst);
|
||||
static_cast<const solve_retval<DecompositionType,Rhs>*>(this)->evalTo(dst);
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -67,17 +69,19 @@ template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base
|
||||
const typename Rhs::Nested m_rhs;
|
||||
};
|
||||
|
||||
} // end namespace internal
|
||||
|
||||
#define EIGEN_MAKE_SOLVE_HELPERS(DecompositionType,Rhs) \
|
||||
typedef typename DecompositionType::MatrixType MatrixType; \
|
||||
typedef typename MatrixType::Scalar Scalar; \
|
||||
typedef typename MatrixType::RealScalar RealScalar; \
|
||||
typedef typename MatrixType::Index Index; \
|
||||
typedef ei_solve_retval_base<DecompositionType,Rhs> Base; \
|
||||
typedef Eigen::internal::solve_retval_base<DecompositionType,Rhs> Base; \
|
||||
using Base::dec; \
|
||||
using Base::rhs; \
|
||||
using Base::rows; \
|
||||
using Base::cols; \
|
||||
ei_solve_retval(const DecompositionType& dec, const Rhs& rhs) \
|
||||
solve_retval(const DecompositionType& dec, const Rhs& rhs) \
|
||||
: Base(dec, rhs) {}
|
||||
|
||||
#endif // EIGEN_MISC_SOLVE_H
|
||||
|
||||
Reference in New Issue
Block a user