mirror/eigen
2
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2024-12-15 07:10:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

port svd to the ei_xxx_return_value thing

Browse Source 
this commit made in caltrain from Palo Alto to SF
This commit is contained in:
Benoit Jacob 2009-11-04 21:00:12 -05:00
parent 0182695204
commit 68210b03c1
1 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Eigen/src/SVD/SVD.h
View File

@ -40,9 +40,10 @@ template<typename MatrixType, typename Rhs> struct ei_svd_solve_impl;
* *
* \sa MatrixBase::SVD() * \sa MatrixBase::SVD()
*/ */
template<typename MatrixType> class SVD template<typename _MatrixType> class SVD
{ {
public: public:
typedef _MatrixType MatrixType;
typedef typename MatrixType::Scalar Scalar; typedef typename MatrixType::Scalar Scalar;
typedef typename NumTraits<typename MatrixType::Scalar>::Real RealScalar; typedef typename NumTraits<typename MatrixType::Scalar>::Real RealScalar;
@ -90,11 +91,11 @@ template<typename MatrixType> class SVD
* \sa MatrixBase::svd(), * \sa MatrixBase::svd(),
*/ */
template<typename Rhs> template<typename Rhs>
inline const ei_svd_solve_impl<MatrixType, Rhs> inline const ei_solve_return_value<SVD, Rhs>
solve(const MatrixBase<Rhs>& b) const solve(const MatrixBase<Rhs>& b) const
{ {
ei_assert(m_isInitialized && "SVD is not initialized."); ei_assert(m_isInitialized && "SVD is not initialized.");
return ei_svd_solve_impl<MatrixType, Rhs>(*this, b.derived()); return ei_solve_return_value<SVD, Rhs>(*this, b.derived());
} }
const MatrixUType& matrixU() const const MatrixUType& matrixU() const
@ -428,54 +429,33 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
return *this; return *this;
} }
template<typename MatrixType,typename Rhs> template<typename MatrixType, typename Rhs, typename Dest>
struct ei_traits<ei_svd_solve_impl<MatrixType,Rhs> > struct ei_solve_impl<SVD<MatrixType>, Rhs, Dest>
: ei_solve_return_value<SVD<MatrixType>, Rhs>
{ {
typedef Matrix<typename Rhs::Scalar, void evalTo(Dest& dst) const
MatrixType::ColsAtCompileTime,
Rhs::ColsAtCompileTime,
Rhs::PlainMatrixType::Options,
MatrixType::MaxColsAtCompileTime,
Rhs::MaxColsAtCompileTime> ReturnMatrixType;
};
template<typename MatrixType, typename Rhs>
struct ei_svd_solve_impl : public ReturnByValue<ei_svd_solve_impl<MatrixType, Rhs> >
{
typedef typename ei_cleantype<typename Rhs::Nested>::type RhsNested;
typedef SVD<MatrixType> SVDType;
typedef typename MatrixType::RealScalar RealScalar;
typedef typename MatrixType::Scalar Scalar;
const SVDType& m_svd;
const typename Rhs::Nested m_rhs;
ei_svd_solve_impl(const SVDType& svd, const Rhs& rhs)
: m_svd(svd), m_rhs(rhs)
{}
inline int rows() const { return m_svd.cols(); }
inline int cols() const { return m_rhs.cols(); }
template<typename Dest> void evalTo(Dest& dst) const
{ {
ei_assert(m_rhs.rows() == m_svd.rows()); typedef typename MatrixType::Scalar Scalar;
typedef typename MatrixType::RealScalar RealScalar;
const int cols = this->cols();
const SVD<MatrixType>& svd = this->m_dec;
const Rhs& rhs = this->m_rhs;
ei_assert(rhs.rows() == svd.rows());
dst.resize(rows(), cols()); for (int j=0; j<cols; ++j)
for (int j=0; j<cols(); ++j)
{ {
Matrix<Scalar,SVDType::RowsAtCompileTime,1> aux = m_svd.matrixU().adjoint() * m_rhs.col(j); Matrix<Scalar,MatrixType::RowsAtCompileTime,1> aux = svd.matrixU().adjoint() * rhs.col(j);
for (int i = 0; i <m_svd.rows(); ++i) for (int i = 0; i <svd.rows(); ++i)
{ {
Scalar si = m_svd.singularValues().coeff(i); Scalar si = svd.singularValues().coeff(i);
if(si == RealScalar(0)) if(si == RealScalar(0))
aux.coeffRef(i) = Scalar(0); aux.coeffRef(i) = Scalar(0);
else else
aux.coeffRef(i) /= si; aux.coeffRef(i) /= si;
} }
dst.col(j) = m_svd.matrixV() * aux; dst.col(j) = svd.matrixV() * aux;
} }
} }
}; };