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

merge

Browse Source
This commit is contained in:
Benoit Jacob 2009-09-02 06:37:41 -04:00
commit cc375e2f79
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Eigen/src/QR/SelfAdjointEigenSolver.h
View File

@ -380,7 +380,7 @@ static void ei_tridiagonal_qr_step(RealScalar* diag, RealScalar* subdiag, int st
if (matrixQ) if (matrixQ)
{ {
Map<Matrix<Scalar,Dynamic,Dynamic> > q(matrixQ,n,n); Map<Matrix<Scalar,Dynamic,Dynamic> > q(matrixQ,n,n);
q.applyJacobiOnTheRight(k,k+1,c,s); q.applyJacobiOnTheRight(k,k+1,JacobiRotation<RealScalar>(c,s));
} }
} }
} }

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

@ -309,7 +309,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
h = Scalar(1.0)/h; h = Scalar(1.0)/h;
c = g*h; c = g*h;
s = -f*h; s = -f*h;
V.applyJacobiOnTheRight(i,nm,c,s); V.applyJacobiOnTheRight(i,nm,JacobiRotation<Scalar>(c,s));
} }
} }
z = W[k]; z = W[k];
@ -351,7 +351,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
g = g*c - x*s; g = g*c - x*s;
h = y*s; h = y*s;
y *= c; y *= c;
V.applyJacobiOnTheRight(i,j,c,s); V.applyJacobiOnTheRight(i,j,JacobiRotation<Scalar>(c,s));
z = pythag(f,h); z = pythag(f,h);
W[j] = z; W[j] = z;
@ -364,7 +364,7 @@ SVD<MatrixType>& SVD<MatrixType>::compute(const MatrixType& matrix)
} }
f = c*g + s*y; f = c*g + s*y;
x = c*y - s*g; x = c*y - s*g;
A.applyJacobiOnTheRight(i,j,c,s); A.applyJacobiOnTheRight(i,j,JacobiRotation<Scalar>(c,s));
} }
rv1[l] = 0.0; rv1[l] = 0.0;
rv1[k] = f; rv1[k] = f;

4
test/main.h
View File

@ -30,6 +30,10 @@
#include <vector> #include <vector>
#include <typeinfo> #include <typeinfo>
#ifdef NDEBUG
#undef NDEBUG
#endif
#ifndef EIGEN_TEST_FUNC #ifndef EIGEN_TEST_FUNC
#error EIGEN_TEST_FUNC must be defined #error EIGEN_TEST_FUNC must be defined
#endif #endif