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

Rename clip2 to clamp.

Browse Source
This commit is contained in:
Rasmus Munk Larsen 2018-05-16 14:04:48 -07:00
parent 812480baa3
commit b8d36774fa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unsupported/Eigen/CXX11/src/Tensor/TensorBase.h
View File

@ -210,9 +210,9 @@ class TensorBase<Derived, ReadOnlyAccessors>
} }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC
EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clip2_op<Scalar>, const Derived> EIGEN_STRONG_INLINE const TensorCwiseUnaryOp<internal::scalar_clamp_op<Scalar>, const Derived>
clip(Scalar min, Scalar max) const { clip(Scalar min, Scalar max) const {
return unaryExpr(internal::scalar_clip2_op<Scalar>(min, max)); return unaryExpr(internal::scalar_clamp_op<Scalar>(min, max));
} }
EIGEN_DEVICE_FUNC EIGEN_DEVICE_FUNC

6
unsupported/Eigen/CXX11/src/Tensor/TensorFunctors.h
View File

@ -488,8 +488,8 @@ struct functor_traits<GaussianGenerator<T, Index, NumDims> > {
}; };
template <typename Scalar> template <typename Scalar>
struct scalar_clip2_op { struct scalar_clamp_op {
EIGEN_DEVICE_FUNC inline scalar_clip2_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {} EIGEN_DEVICE_FUNC inline scalar_clamp_op(const Scalar& _min, const Scalar& _max) : m_min(_min), m_max(_max) {}
EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar
operator()(const Scalar& x) const { operator()(const Scalar& x) const {
return numext::mini(numext::maxi(x, m_min), m_max); return numext::mini(numext::maxi(x, m_min), m_max);
@ -503,7 +503,7 @@ struct scalar_clip2_op {
const Scalar m_max; const Scalar m_max;
}; };
template<typename Scalar> template<typename Scalar>
struct functor_traits<scalar_clip2_op<Scalar> > struct functor_traits<scalar_clamp_op<Scalar> >
{ enum { Cost = 2 * NumTraits<Scalar>::AddCost, PacketAccess = (packet_traits<Scalar>::HasMin && packet_traits<Scalar>::HasMax)}; }; { enum { Cost = 2 * NumTraits<Scalar>::AddCost, PacketAccess = (packet_traits<Scalar>::HasMin && packet_traits<Scalar>::HasMax)}; };
} // end namespace internal } // end namespace internal