GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-06-04 18:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

BDCSVD: Use HouseholderSeq directly.

Browse Source
This commit is contained in:
Jitse Niesen 2013-08-21 14:34:48 +01:00
parent 1b8394f71f
commit d1c48f1606
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
unsupported/Eigen/src/SVD/BDCSVD.h
View File

@ -203,7 +203,8 @@ private:
void deflation43(Index firstCol, Index shift, Index i, Index size); void deflation43(Index firstCol, Index shift, Index i, Index size);
void deflation44(Index firstColu , Index firstColm, Index firstRowW, Index firstColW, Index i, Index j, Index size); void deflation44(Index firstColu , Index firstColm, Index firstRowW, Index firstColW, Index i, Index j, Index size);
void deflation(Index firstCol, Index lastCol, Index k, Index firstRowW, Index firstColW, Index shift); void deflation(Index firstCol, Index lastCol, Index k, Index firstRowW, Index firstColW, Index shift);
void copyUV(MatrixX householderU, MatrixX houseHolderV); void copyUV(const typename internal::UpperBidiagonalization<MatrixX>::HouseholderUSequenceType& householderU,
const typename internal::UpperBidiagonalization<MatrixX>::HouseholderVSequenceType& householderV);
protected: protected:
MatrixXr m_naiveU, m_naiveV; MatrixXr m_naiveU, m_naiveV;
@ -281,7 +282,7 @@ BDCSVD<MatrixType>::compute(const MatrixType& matrix, unsigned int computationOp
if (isTranspose) copy = matrix.adjoint(); if (isTranspose) copy = matrix.adjoint();
else copy = matrix; else copy = matrix;
internal::UpperBidiagonalization<MatrixX > bid(copy); internal::UpperBidiagonalization<MatrixX> bid(copy);
//**** step 2 Divide //**** step 2 Divide
m_computed.topRows(this->m_diagSize) = bid.bidiagonal().toDenseMatrix().transpose(); m_computed.topRows(this->m_diagSize) = bid.bidiagonal().toDenseMatrix().transpose();
@ -309,9 +310,10 @@ BDCSVD<MatrixType>::compute(const MatrixType& matrix, unsigned int computationOp
}// end compute }// end compute
// TODO: this function should accept householder sequences to save converting them to matrix
template<typename MatrixType> template<typename MatrixType>
void BDCSVD<MatrixType>::copyUV(MatrixX householderU, MatrixX householderV){ void BDCSVD<MatrixType>::copyUV(const typename internal::UpperBidiagonalization<MatrixX>::HouseholderUSequenceType& householderU,
const typename internal::UpperBidiagonalization<MatrixX>::HouseholderVSequenceType& householderV)
{
// Note exchange of U and V: m_matrixU is set from m_naiveV and vice versa // Note exchange of U and V: m_matrixU is set from m_naiveV and vice versa
if (this->computeU()){ if (this->computeU()){
Index Ucols = this->m_computeThinU ? this->m_nonzeroSingularValues : householderU.cols(); Index Ucols = this->m_computeThinU ? this->m_nonzeroSingularValues : householderU.cols();