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

svd: sort in decreasing order, remove unused code

Browse Source
This commit is contained in:
Benoit Jacob 2009-08-15 19:20:48 -04:00
parent 239ada95b7
commit 03c1e79f35
2 changed files with 1 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,6 @@ template<typename MatrixType> class SVD
}
void compute(const MatrixType& matrix);
SVD& sort();
template<typename UnitaryType, typename PositiveType>
void computeUnitaryPositive(UnitaryType *unitary, PositiveType *positive) const;
@ -392,7 +391,7 @@ void SVD<MatrixType>::compute(const MatrixType& matrix)
for (int i=0; i<n; i++)
{
int k;
W.end(n-i).minCoeff(&k);
W.end(n-i).maxCoeff(&k);
if (k != 0)
{
k += i;
@ -411,45 +410,6 @@ void SVD<MatrixType>::compute(const MatrixType& matrix)
m_isInitialized = true;
}
template<typename MatrixType>
SVD<MatrixType>& SVD<MatrixType>::sort()
{
ei_assert(m_isInitialized && "SVD is not initialized.");
int mu = m_matU.rows();
int mv = m_matV.rows();
int n = m_matU.cols();
for (int i=0; i<n; ++i)
{
int k = i;
Scalar p = m_sigma.coeff(i);
for (int j=i+1; j<n; ++j)
{
if (m_sigma.coeff(j) > p)
{
k = j;
p = m_sigma.coeff(j);
}
}
if (k != i)
{
m_sigma.coeffRef(k) = m_sigma.coeff(i); // i.e.
m_sigma.coeffRef(i) = p; // swaps the i-th and the k-th elements
int j = mu;
for(int s=0; j!=0; ++s, --j)
std::swap(m_matU.coeffRef(s,i), m_matU.coeffRef(s,k));
j = mv;
for (int s=0; j!=0; ++s, --j)
std::swap(m_matV.coeffRef(s,i), m_matV.coeffRef(s,k));
}
}
return *this;
}
/** \returns the solution of \f$ A x = b \f$ using the current SVD decomposition of A.
* The parts of the solution corresponding to zero singular values are ignored.
*

1
test/svd.cpp
View File

@ -95,7 +95,6 @@ template<typename MatrixType> void svd_verify_assert()
VERIFY_RAISES_ASSERT(svd.matrixU())
VERIFY_RAISES_ASSERT(svd.singularValues())
VERIFY_RAISES_ASSERT(svd.matrixV())
VERIFY_RAISES_ASSERT(svd.sort())
VERIFY_RAISES_ASSERT(svd.computeUnitaryPositive(&tmp,&tmp))
VERIFY_RAISES_ASSERT(svd.computePositiveUnitary(&tmp,&tmp))
VERIFY_RAISES_ASSERT(svd.computeRotationScaling(&tmp,&tmp))