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

add TriangularMatrix::conjugate to be consistent since we have adjoint

Browse Source
This commit is contained in:
Gael Guennebaud 2010-08-23 23:38:35 +02:00
parent 474c2996bd
commit 6261f4629f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Eigen/src/Core/TriangularMatrix.h
View File

@ -154,11 +154,17 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularView
typedef TriangularBase<TriangularView> Base; typedef TriangularBase<TriangularView> Base;
typedef typename ei_traits<TriangularView>::Scalar Scalar; typedef typename ei_traits<TriangularView>::Scalar Scalar;
protected:
typedef _MatrixType MatrixType; typedef _MatrixType MatrixType;
typedef typename MatrixType::PlainObject DenseMatrixType; typedef typename MatrixType::PlainObject DenseMatrixType;
typedef typename MatrixType::Nested MatrixTypeNested; typedef typename MatrixType::Nested MatrixTypeNested;
typedef typename ei_cleantype<MatrixTypeNested>::type _MatrixTypeNested; typedef typename ei_cleantype<MatrixTypeNested>::type _MatrixTypeNested;
typedef typename ei_cleantype<typename MatrixType::ConjugateReturnType>::type MatrixConjugateReturnType;
public:
using Base::evalToLazy; using Base::evalToLazy;
typedef typename ei_traits<TriangularView>::StorageKind StorageKind; typedef typename ei_traits<TriangularView>::StorageKind StorageKind;
typedef typename ei_traits<TriangularView>::Index Index; typedef typename ei_traits<TriangularView>::Index Index;
@ -235,6 +241,12 @@ template<typename _MatrixType, unsigned int _Mode> class TriangularView
template<typename OtherDerived> template<typename OtherDerived>
void lazyAssign(const MatrixBase<OtherDerived>& other); void lazyAssign(const MatrixBase<OtherDerived>& other);
/** \sa MatrixBase::conjugate() */
inline TriangularView<MatrixConjugateReturnType,Mode> conjugate()
{ return m_matrix.conjugate(); }
/** \sa MatrixBase::conjugate() const */
inline const TriangularView<MatrixConjugateReturnType,Mode> conjugate() const
{ return m_matrix.conjugate(); }
/** \sa MatrixBase::adjoint() */ /** \sa MatrixBase::adjoint() */
inline TriangularView<typename MatrixType::AdjointReturnType,TransposeMode> adjoint() inline TriangularView<typename MatrixType::AdjointReturnType,TransposeMode> adjoint()

3
test/triangular.cpp
View File

@ -83,6 +83,9 @@ template<typename MatrixType> void triangular_square(const MatrixType& m)
m1.template triangularView<Lower>() = m2.transpose() + m2; m1.template triangularView<Lower>() = m2.transpose() + m2;
VERIFY_IS_APPROX(m3.template triangularView<Lower>().toDenseMatrix(), m1); VERIFY_IS_APPROX(m3.template triangularView<Lower>().toDenseMatrix(), m1);
VERIFY_IS_APPROX(m3.template triangularView<Lower>().conjugate().toDenseMatrix(),
m3.conjugate().template triangularView<Lower>().toDenseMatrix());
m1 = MatrixType::Random(rows, cols); m1 = MatrixType::Random(rows, cols);
for (int i=0; i<rows; ++i) for (int i=0; i<rows; ++i)
while (ei_abs2(m1(i,i))<1e-1) m1(i,i) = ei_random<Scalar>(); while (ei_abs2(m1(i,i))<1e-1) m1(i,i) = ei_random<Scalar>();