diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-08-11 19:26:41 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-08-11 19:26:41 +0200 |
| commit | 916d29e58f678d265eca84115148f7bd97f588a7 (patch) | |
| tree | 565977420640e68eade5d571443abaf6b2620c15 | |
| parent | bffdc491b304cb207ed63cc421f39e597f8a6a9d (diff) | |
Backout parts of changeset 6719e56b5bfe9ae4badc9a6e894c5824f663d62e
(these changes were not intended to be commited)
| -rw-r--r-- | unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/src/MatrixFunctions/MatrixPower.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h index 763ed414a..8d42e69b9 100644 --- a/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h +++ b/unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h @@ -604,7 +604,7 @@ atan2(const AutoDiffScalar<DerTypeA>& a, const AutoDiffScalar<DerTypeB>& b) Scalar tmp4 = tmp3/(tmp2+tmp3); if (tmp4!=0) - ret.derivatives() = (a.value() * b.derivatives() - a.derivatives() * b.value()) * (tmp2+tmp3); + ret.derivatives() = (a.derivatives() * b.value() - a.value() * b.derivatives()) * (tmp2+tmp3); return ret; } diff --git a/unsupported/Eigen/src/MatrixFunctions/MatrixPower.h b/unsupported/Eigen/src/MatrixFunctions/MatrixPower.h index b91d8632a..ee665c18e 100644 --- a/unsupported/Eigen/src/MatrixFunctions/MatrixPower.h +++ b/unsupported/Eigen/src/MatrixFunctions/MatrixPower.h @@ -299,7 +299,7 @@ MatrixPowerAtomic<MatrixType>::computeSuperDiag(const ComplexScalar& curr, const ComplexScalar logCurr = log(curr); ComplexScalar logPrev = log(prev); int unwindingNumber = ceil((numext::imag(logCurr - logPrev) - M_PI) / (2*M_PI)); - ComplexScalar w = numext::atanh2(curr - prev, curr + prev) + ComplexScalar(RealScalar(0), RealScalar(M_PI*unwindingNumber)); + ComplexScalar w = numext::atanh2(curr - prev, curr + prev) + ComplexScalar(0, M_PI*unwindingNumber); return RealScalar(2) * exp(RealScalar(0.5) * p * (logCurr + logPrev)) * sinh(p * w) / (curr - prev); } |