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

Fix double to Scalar unwanted promotions

Browse Source
This commit is contained in:
Nicolas Mellado 2015-06-21 20:21:23 +02:00
parent 84aaef93ba
commit ad5fdc7ddd
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Eigen/src/Eigenvalues/EigenSolver.h
View File

@ -484,7 +484,7 @@ void EigenSolver<MatrixType>::doComputeEigenvectors()
} }
// Backsubstitute to find vectors of upper triangular form // Backsubstitute to find vectors of upper triangular form
if (norm == 0.0) if (norm == Scalar(0))
{ {
return; return;
} }
@ -506,7 +506,7 @@ void EigenSolver<MatrixType>::doComputeEigenvectors()
Scalar w = m_matT.coeff(i,i) - p; Scalar w = m_matT.coeff(i,i) - p;
Scalar r = m_matT.row(i).segment(l,n-l+1).dot(m_matT.col(n).segment(l, n-l+1)); Scalar r = m_matT.row(i).segment(l,n-l+1).dot(m_matT.col(n).segment(l, n-l+1));
if (m_eivalues.coeff(i).imag() < 0.0) if (m_eivalues.coeff(i).imag() < Scalar(0))
{ {
lastw = w; lastw = w;
lastr = r; lastr = r;
@ -514,9 +514,9 @@ void EigenSolver<MatrixType>::doComputeEigenvectors()
else else
{ {
l = i; l = i;
if (m_eivalues.coeff(i).imag() == 0.0) if (m_eivalues.coeff(i).imag() == Scalar(0))
{ {
if (w != 0.0) if (w != Scalar(0))
m_matT.coeffRef(i,n) = -r / w; m_matT.coeffRef(i,n) = -r / w;
else else
m_matT.coeffRef(i,n) = -r / (eps * norm); m_matT.coeffRef(i,n) = -r / (eps * norm);
@ -554,19 +554,19 @@ void EigenSolver<MatrixType>::doComputeEigenvectors()
} }
else else
{ {
std::complex<Scalar> cc = cdiv<Scalar>(0.0,-m_matT.coeff(n-1,n),m_matT.coeff(n-1,n-1)-p,q); std::complex<Scalar> cc = cdiv<Scalar>(Scalar(0),-m_matT.coeff(n-1,n),m_matT.coeff(n-1,n-1)-p,q);
m_matT.coeffRef(n-1,n-1) = numext::real(cc); m_matT.coeffRef(n-1,n-1) = numext::real(cc);
m_matT.coeffRef(n-1,n) = numext::imag(cc); m_matT.coeffRef(n-1,n) = numext::imag(cc);
} }
m_matT.coeffRef(n,n-1) = 0.0; m_matT.coeffRef(n,n-1) = Scalar(0);
m_matT.coeffRef(n,n) = 1.0; m_matT.coeffRef(n,n) = Scalar(0);
for (Index i = n-2; i >= 0; i--) for (Index i = n-2; i >= 0; i--)
{ {
Scalar ra = m_matT.row(i).segment(l, n-l+1).dot(m_matT.col(n-1).segment(l, n-l+1)); Scalar ra = m_matT.row(i).segment(l, n-l+1).dot(m_matT.col(n-1).segment(l, n-l+1));
Scalar sa = m_matT.row(i).segment(l, n-l+1).dot(m_matT.col(n).segment(l, n-l+1)); Scalar sa = m_matT.row(i).segment(l, n-l+1).dot(m_matT.col(n).segment(l, n-l+1));
Scalar w = m_matT.coeff(i,i) - p; Scalar w = m_matT.coeff(i,i) - p;
if (m_eivalues.coeff(i).imag() < 0.0) if (m_eivalues.coeff(i).imag() < Scalar(0))
{ {
lastw = w; lastw = w;
lastra = ra; lastra = ra;
@ -588,7 +588,7 @@ void EigenSolver<MatrixType>::doComputeEigenvectors()
Scalar y = m_matT.coeff(i+1,i); Scalar y = m_matT.coeff(i+1,i);
Scalar vr = (m_eivalues.coeff(i).real() - p) * (m_eivalues.coeff(i).real() - p) + m_eivalues.coeff(i).imag() * m_eivalues.coeff(i).imag() - q * q; Scalar vr = (m_eivalues.coeff(i).real() - p) * (m_eivalues.coeff(i).real() - p) + m_eivalues.coeff(i).imag() * m_eivalues.coeff(i).imag() - q * q;
Scalar vi = (m_eivalues.coeff(i).real() - p) * Scalar(2) * q; Scalar vi = (m_eivalues.coeff(i).real() - p) * Scalar(2) * q;
if ((vr == 0.0) && (vi == 0.0)) if ((vr == Scalar(0)) && (vi == Scalar(0)))
vr = eps * norm * (abs(w) + abs(q) + abs(x) + abs(y) + abs(lastw)); vr = eps * norm * (abs(w) + abs(q) + abs(x) + abs(y) + abs(lastw));
std::complex<Scalar> cc = cdiv(x*lastra-lastw*ra+q*sa,x*lastsa-lastw*sa-q*ra,vr,vi); std::complex<Scalar> cc = cdiv(x*lastra-lastw*ra+q*sa,x*lastsa-lastw*sa-q*ra,vr,vi);