devtools/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2026-04-10 11:34:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple of issues introduced in previous commits.

Browse Source 
Added a test for Triangular.
This commit is contained in:
Gael Guennebaud
2008-04-26 20:28:27 +00:00
parent b4c974d059
commit 1ec2d21ca5
7 changed files with 53 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Eigen/src/Core/Assign.h
View File

@@ -104,7 +104,7 @@ bool Vectorize = (Derived::Flags & OtherDerived::Flags & VectorizableBit)
||((Derived::Flags&RowMajorBit)
? Derived::ColsAtCompileTime!=Dynamic && (Derived::ColsAtCompileTime%ei_packet_traits<typename Derived::Scalar>::size==0)
: Derived::RowsAtCompileTime!=Dynamic && (Derived::RowsAtCompileTime%ei_packet_traits<typename Derived::Scalar>::size==0)) ),
bool TriangularAssign = false>
bool TriangularAssign = Derived::Flags & (NullLowerBit | NullUpperBit)>
struct ei_assignment_impl;
template<typename Derived>
@@ -113,9 +113,7 @@ Derived& MatrixBase<Derived>
::lazyAssign(const MatrixBase<OtherDerived>& other)
{
// std::cout << "lazyAssign = " << Derived::Flags << " " << OtherDerived::Flags << "\n";
ei_assignment_impl<Derived, OtherDerived,
Derived::Flags & (NullLowerBit | NullUpperBit)>
::execute(derived(),other.derived());
ei_assignment_impl<Derived, OtherDerived>::execute(derived(),other.derived());
return derived();
}
@@ -145,7 +143,7 @@ Derived& MatrixBase<Derived>
}
template <typename Derived, typename OtherDerived>
struct ei_assignment_impl<Derived, OtherDerived, false>
struct ei_assignment_impl<Derived, OtherDerived, false, false>
{
static void execute(Derived & dst, const OtherDerived & src)
{
@@ -179,7 +177,7 @@ struct ei_assignment_impl<Derived, OtherDerived, false>
};
template <typename Derived, typename OtherDerived>
struct ei_assignment_impl<Derived, OtherDerived, true>
struct ei_assignment_impl<Derived, OtherDerived, true, false>
{
static void execute(Derived & dst, const OtherDerived & src)
{

2
Eigen/src/Core/CwiseUnaryOp.h
View File

@@ -52,7 +52,7 @@ struct ei_traits<CwiseUnaryOp<UnaryOp, MatrixType> >
MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime,
Flags = (MatrixType::Flags & (
DefaultLostFlagMask | Like1DArrayBit
| ei_functor_traits<UnaryOp>::IsVectorizable ? VectorizableBit : 0)),
| (ei_functor_traits<UnaryOp>::IsVectorizable ? VectorizableBit : 0))),
CoeffReadCost = MatrixType::CoeffReadCost + ei_functor_traits<UnaryOp>::Cost
};
};

26
Eigen/src/Core/Triangular.h
View File

@@ -61,10 +61,10 @@ struct ei_traits<Triangular<Mode, MatrixType> >
{
typedef typename MatrixType::Scalar Scalar;
enum {
RowsAtCompileTime = MatrixType::SizeAtCompileTime,
ColsAtCompileTime = MatrixType::SizeAtCompileTime,
MaxRowsAtCompileTime = MatrixType::MaxSizeAtCompileTime,
MaxColsAtCompileTime = MatrixType::MaxSizeAtCompileTime,
RowsAtCompileTime = MatrixType::RowsAtCompileTime,
ColsAtCompileTime = MatrixType::ColsAtCompileTime,
MaxRowsAtCompileTime = MatrixType::MaxRowsAtCompileTime,
MaxColsAtCompileTime = MatrixType::MaxColsAtCompileTime,
Flags = MatrixType::Flags & (~(VectorizableBit | Like1DArrayBit)) | Mode,
CoeffReadCost = MatrixType::CoeffReadCost
};
@@ -84,16 +84,18 @@ template<int Mode, typename MatrixType> class Triangular
assert(matrix.rows()==matrix.cols());
}
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Triangular)
/** Overloaded to keep a Triangular expression */
Triangular<(Upper | Lower) xor Mode, Transpose<MatrixType> > transpose()
Triangular<(Upper | Lower) xor Mode, Temporary<Transpose<MatrixType> > > transpose()
{
return Triangular<(Upper | Lower) xor Mode, Transpose<MatrixType> >((m_matrix.transpose()));
return Triangular<(Upper | Lower) xor Mode, Temporary<Transpose<MatrixType> > >((m_matrix.transpose().temporary()));
}
/** Overloaded to keep a Triangular expression */
const Triangular<(Upper | Lower) xor Mode, Transpose<MatrixType> > transpose() const
const Triangular<(Upper | Lower) xor Mode, Temporary<Transpose<MatrixType> > > transpose() const
{
return Triangular<(Upper | Lower) xor Mode, Transpose<MatrixType> >((m_matrix.transpose()));
return Triangular<(Upper | Lower) xor Mode, Temporary<Transpose<MatrixType> > >((m_matrix.transpose().temporary()));
}
/** \returns the product of the inverse of *this with \a other.
@@ -121,7 +123,7 @@ template<int Mode, typename MatrixType> class Triangular
res(0,c) = other(0,c)/_coeff(0, 0);
for (int i=1 ; i<_rows() ; ++i)
{
Scalar tmp = other(i,c) - ((this->row(i).start(i)).transpose() * res.col(c).start(i))(0,0);
Scalar tmp = other(i,c) - ((this->row(i).start(i)) * res.col(c).start(i))(0,0);
if (Flags & UnitDiagBit)
res(i,c) = tmp;
else
@@ -137,7 +139,7 @@ template<int Mode, typename MatrixType> class Triangular
res(_cols()-1,c) = other(_cols()-1, c)/_coeff(_rows()-1, _cols()-1);
for (int i=_rows()-2 ; i>=0 ; --i)
{
Scalar tmp = other(i,c) - ((this->row(i).end(_cols()-i-1)).transpose() * res.col(c).end(_cols()-i-1))(0,0);
Scalar tmp = other(i,c) - ((this->row(i).end(_cols()-i-1)) * res.col(c).end(_cols()-i-1))(0,0);
if (Flags & UnitDiagBit)
res(i,c) = tmp;
else
@@ -155,8 +157,8 @@ template<int Mode, typename MatrixType> class Triangular
Scalar& _coeffRef(int row, int col)
{
assert( ((! Flags & Lower) && row<=col) || (Flags & Lower && col<=row));
return m_matrix.coeffRef(row, col);
ei_assert( ((! (Flags & Lower)) && row<=col) || (Flags & Lower && col<=row));
return m_matrix.const_cast_derived().coeffRef(row, col);
}
Scalar _coeff(int row, int col) const