diff options
author | Gael Guennebaud <g.gael@free.fr> | 2011-05-23 13:34:04 +0200 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2011-05-23 13:34:04 +0200 |
commit | 46bee5682fc41a8e2ad1f563b6362a9297ca3094 (patch) | |
tree | 2dc3af69d997b997ea9c5e55b8fb18ce84317e09 /Eigen/src/Jacobi | |
parent | 074b067624e45c8e9f42f2347509d06d0d437226 (diff) |
clean a bit previous patch (ctor vs static_cast and a few bits)
Diffstat (limited to 'Eigen/src/Jacobi')
-rw-r--r-- | Eigen/src/Jacobi/Jacobi.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/Jacobi/Jacobi.h b/Eigen/src/Jacobi/Jacobi.h index 27058a97e..98dea6800 100644 --- a/Eigen/src/Jacobi/Jacobi.h +++ b/Eigen/src/Jacobi/Jacobi.h @@ -104,9 +104,9 @@ bool JacobiRotation<Scalar>::makeJacobi(RealScalar x, Scalar y, RealScalar z) else { RealScalar tau = (x-z)/(RealScalar(2)*internal::abs(y)); - RealScalar w = internal::sqrt(internal::abs2(tau) + static_cast<RealScalar>(1)); + RealScalar w = internal::sqrt(internal::abs2(tau) + RealScalar(1)); RealScalar t; - if(tau>static_cast<RealScalar>(0)) + if(tau>RealScalar(0)) { t = RealScalar(1) / (tau + w); } @@ -114,8 +114,8 @@ bool JacobiRotation<Scalar>::makeJacobi(RealScalar x, Scalar y, RealScalar z) { t = RealScalar(1) / (tau - w); } - RealScalar sign_t = t > static_cast<RealScalar>(0) ? static_cast<RealScalar>(1) : static_cast<RealScalar>(-1); - RealScalar n = RealScalar(1) / internal::sqrt(internal::abs2(t)+static_cast<RealScalar>(1)); + RealScalar sign_t = t > RealScalar(0) ? RealScalar(1) : RealScalar(-1); + RealScalar n = RealScalar(1) / internal::sqrt(internal::abs2(t)+RealScalar(1)); m_s = - sign_t * (internal::conj(y) / internal::abs(y)) * internal::abs(t) * n; m_c = n; return true; @@ -221,13 +221,13 @@ template<typename Scalar> void JacobiRotation<Scalar>::makeGivens(const Scalar& p, const Scalar& q, Scalar* r, internal::false_type) { - if(q==static_cast<Scalar>(0)) + if(q==Scalar(0)) { m_c = p<Scalar(0) ? Scalar(-1) : Scalar(1); m_s = Scalar(0); if(r) *r = internal::abs(p); } - else if(p==static_cast<Scalar>(0)) + else if(p==Scalar(0)) { m_c = Scalar(0); m_s = q<Scalar(0) ? Scalar(1) : Scalar(-1); |