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

Removed NestByValue dependency from MatrixBase::select().

Browse Source
This commit is contained in:
Hauke Heibel 2009-12-01 09:49:15 +01:00
parent 82971a5dcd
commit 88be826791
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Eigen/src/Array/Select.h
View File

@ -131,11 +131,11 @@ MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix,
*/ */
template<typename Derived> template<typename Derived>
template<typename ThenDerived> template<typename ThenDerived>
inline const Select<Derived,ThenDerived, NestByValue<typename ThenDerived::ConstantReturnType> > inline const Select<Derived,ThenDerived, typename ThenDerived::ConstantReturnType>
MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix, MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix,
typename ThenDerived::Scalar elseScalar) const typename ThenDerived::Scalar elseScalar) const
{ {
return Select<Derived,ThenDerived,NestByValue<typename ThenDerived::ConstantReturnType> >( return Select<Derived,ThenDerived,typename ThenDerived::ConstantReturnType>(
derived(), thenMatrix.derived(), ThenDerived::Constant(rows(),cols(),elseScalar)); derived(), thenMatrix.derived(), ThenDerived::Constant(rows(),cols(),elseScalar));
} }
@ -148,11 +148,11 @@ MatrixBase<Derived>::select(const MatrixBase<ThenDerived>& thenMatrix,
*/ */
template<typename Derived> template<typename Derived>
template<typename ElseDerived> template<typename ElseDerived>
inline const Select<Derived, NestByValue<typename ElseDerived::ConstantReturnType>, ElseDerived > inline const Select<Derived, typename ElseDerived::ConstantReturnType, ElseDerived >
MatrixBase<Derived>::select(typename ElseDerived::Scalar thenScalar, MatrixBase<Derived>::select(typename ElseDerived::Scalar thenScalar,
const MatrixBase<ElseDerived>& elseMatrix) const const MatrixBase<ElseDerived>& elseMatrix) const
{ {
return Select<Derived,NestByValue<typename ElseDerived::ConstantReturnType>,ElseDerived>( return Select<Derived,typename ElseDerived::ConstantReturnType,ElseDerived>(
derived(), ElseDerived::Constant(rows(),cols(),thenScalar), elseMatrix.derived()); derived(), ElseDerived::Constant(rows(),cols(),thenScalar), elseMatrix.derived());
} }

4
Eigen/src/Core/MatrixBase.h
View File

@ -694,11 +694,11 @@ template<typename Derived> class MatrixBase
const MatrixBase<ElseDerived>& elseMatrix) const; const MatrixBase<ElseDerived>& elseMatrix) const;
template<typename ThenDerived> template<typename ThenDerived>
inline const Select<Derived,ThenDerived, NestByValue<typename ThenDerived::ConstantReturnType> > inline const Select<Derived,ThenDerived, typename ThenDerived::ConstantReturnType>
select(const MatrixBase<ThenDerived>& thenMatrix, typename ThenDerived::Scalar elseScalar) const; select(const MatrixBase<ThenDerived>& thenMatrix, typename ThenDerived::Scalar elseScalar) const;
template<typename ElseDerived> template<typename ElseDerived>
inline const Select<Derived, NestByValue<typename ElseDerived::ConstantReturnType>, ElseDerived > inline const Select<Derived, typename ElseDerived::ConstantReturnType, ElseDerived >
select(typename ElseDerived::Scalar thenScalar, const MatrixBase<ElseDerived>& elseMatrix) const; select(typename ElseDerived::Scalar thenScalar, const MatrixBase<ElseDerived>& elseMatrix) const;
template<int p> RealScalar lpNorm() const; template<int p> RealScalar lpNorm() const;