Removed NestByValue dependency from VectorwiseOp.

This commit is contained in:
Hauke Heibel 2009-12-01 09:56:40 +01:00
parent 88be826791
commit 7b3e205ebd

View File

@ -436,7 +436,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
template<typename OtherDerived> template<typename OtherDerived>
CwiseBinaryOp<ei_scalar_sum_op<Scalar>, CwiseBinaryOp<ei_scalar_sum_op<Scalar>,
ExpressionType, ExpressionType,
NestByValue<typename ExtendedType<OtherDerived>::Type> > typename ExtendedType<OtherDerived>::Type>
operator+(const MatrixBase<OtherDerived>& other) const operator+(const MatrixBase<OtherDerived>& other) const
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived); EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived);
@ -447,7 +447,7 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
template<typename OtherDerived> template<typename OtherDerived>
CwiseBinaryOp<ei_scalar_difference_op<Scalar>, CwiseBinaryOp<ei_scalar_difference_op<Scalar>,
ExpressionType, ExpressionType,
NestByValue<typename ExtendedType<OtherDerived>::Type> > typename ExtendedType<OtherDerived>::Type>
operator-(const MatrixBase<OtherDerived>& other) const operator-(const MatrixBase<OtherDerived>& other) const
{ {
EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived); EIGEN_STATIC_ASSERT_VECTOR_ONLY(OtherDerived);
@ -478,10 +478,10 @@ template<typename ExpressionType, int Direction> class VectorwiseOp
Direction==Horizontal ? 1 : int(ei_traits<ExpressionType>::ColsAtCompileTime)> Direction==Horizontal ? 1 : int(ei_traits<ExpressionType>::ColsAtCompileTime)>
HNormalized_Factors; HNormalized_Factors;
typedef CwiseBinaryOp<ei_scalar_quotient_op<typename ei_traits<ExpressionType>::Scalar>, typedef CwiseBinaryOp<ei_scalar_quotient_op<typename ei_traits<ExpressionType>::Scalar>,
NestByValue<HNormalized_Block>, HNormalized_Block,
NestByValue<Replicate<NestByValue<HNormalized_Factors>, Replicate<HNormalized_Factors,
Direction==Vertical ? HNormalized_SizeMinusOne : 1, Direction==Vertical ? HNormalized_SizeMinusOne : 1,
Direction==Horizontal ? HNormalized_SizeMinusOne : 1> > > Direction==Horizontal ? HNormalized_SizeMinusOne : 1> >
HNormalizedReturnType; HNormalizedReturnType;
const HNormalizedReturnType hnormalized() const; const HNormalizedReturnType hnormalized() const;