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

AutoDiffScalar: fix bug with operator/, add missing functions

Browse Source
This commit is contained in:
Philip Avery 2012-05-02 17:17:12 +02:00
parent 8f47246475
commit cb3b1bb73e
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
View File

@ -101,7 +101,7 @@ class AutoDiffScalar
/** Conversion from a scalar constant to an active scalar. /** Conversion from a scalar constant to an active scalar.
* The derivatives are set to zero. */ * The derivatives are set to zero. */
explicit AutoDiffScalar(const Real& value) /*explicit*/ AutoDiffScalar(const Real& value)
: m_value(value) : m_value(value)
{ {
if(m_derivatives.size()>0) if(m_derivatives.size()>0)
@ -228,6 +228,12 @@ class AutoDiffScalar
(a - b.value(), -b.derivatives()); (a - b.value(), -b.derivatives());
} }
inline AutoDiffScalar& operator-=(const Scalar& other)
{
value() -= other;
return *this;
}
template<typename OtherDerType> template<typename OtherDerType>
inline const AutoDiffScalar<CwiseBinaryOp<internal::scalar_difference_op<Scalar>, const DerType,const typename internal::remove_all<OtherDerType>::type> > inline const AutoDiffScalar<CwiseBinaryOp<internal::scalar_difference_op<Scalar>, const DerType,const typename internal::remove_all<OtherDerType>::type> >
operator-(const AutoDiffScalar<OtherDerType>& other) const operator-(const AutoDiffScalar<OtherDerType>& other) const
@ -299,7 +305,7 @@ class AutoDiffScalar
{ {
return AutoDiffScalar<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DerType> >( return AutoDiffScalar<CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, const DerType> >(
other / a.value(), other / a.value(),
a.derivatives() * (-Scalar(1)/other)); a.derivatives() * (Scalar(-other) / (a.value()*a.value())));
} }
// inline const AutoDiffScalar<typename CwiseUnaryOp<internal::scalar_multiple_op<Real>, DerType>::Type > // inline const AutoDiffScalar<typename CwiseUnaryOp<internal::scalar_multiple_op<Real>, DerType>::Type >
@ -362,6 +368,19 @@ class AutoDiffScalar
return *this; return *this;
} }
inline AutoDiffScalar& operator/=(const Scalar& other)
{
*this = *this / other;
return *this;
}
template<typename OtherDerType>
inline AutoDiffScalar& operator/=(const AutoDiffScalar<OtherDerType>& other)
{
*this = *this / other;
return *this;
}
protected: protected:
Scalar m_value; Scalar m_value;
DerType m_derivatives; DerType m_derivatives;
@ -519,6 +538,16 @@ template<typename DerType>
inline const AutoDiffScalar<DerType>& real(const AutoDiffScalar<DerType>& x) { return x; } inline const AutoDiffScalar<DerType>& real(const AutoDiffScalar<DerType>& x) { return x; }
template<typename DerType> template<typename DerType>
inline typename DerType::Scalar imag(const AutoDiffScalar<DerType>&) { return 0.; } inline typename DerType::Scalar imag(const AutoDiffScalar<DerType>&) { return 0.; }
template<typename DerType, typename T>
inline AutoDiffScalar<DerType> min(const AutoDiffScalar<DerType>& x, const T& y) { return (x <= y ? x : y); }
template<typename DerType, typename T>
inline AutoDiffScalar<DerType> max(const AutoDiffScalar<DerType>& x, const T& y) { return (x >= y ? x : y); }
template<typename DerType, typename T>
inline AutoDiffScalar<DerType> min(const T& x, const AutoDiffScalar<DerType>& y) { return (x < y ? x : y); }
template<typename DerType, typename T>
inline AutoDiffScalar<DerType> max(const T& x, const AutoDiffScalar<DerType>& y) { return (x > y ? x : y); }
#define sign(x) x >= 0 ? 1 : -1 // required for abs function below
EIGEN_AUTODIFF_DECLARE_GLOBAL_UNARY(abs, EIGEN_AUTODIFF_DECLARE_GLOBAL_UNARY(abs,
using std::abs; using std::abs;