diff options
| author |  Allan Leal <allanmulin@gmail.com> | 2020-03-16 11:59:02 +0000 |
|---|---|---|
| committer | Allan Leal <allanmulin@gmail.com> | 2020-03-16 11:59:02 +0000 |
| commit | 37ccb869166beab93d1bc56a6d3af3b2133db396 (patch) | |
| tree | f59eca992d83d9b02ab0a3d57ee1e90310884ce7 /Eigen/src/Core/functors | |
| parent | 7158ed4e0e34d40cd0f358a3bf69a5c30d8d0f83 (diff) | |
Update NullaryFunctors.h
Diffstat (limited to 'Eigen/src/Core/functors')
| -rw-r--r-- | Eigen/src/Core/functors/NullaryFunctors.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/functors/NullaryFunctors.h b/Eigen/src/Core/functors/NullaryFunctors.h index 16b645f91..a3b737ad8 100644 --- a/Eigen/src/Core/functors/NullaryFunctors.h +++ b/Eigen/src/Core/functors/NullaryFunctors.h @@ -45,16 +45,16 @@ struct linspaced_op_impl<Scalar,/*IsInteger*/false> typedef typename NumTraits<Scalar>::Real RealScalar; linspaced_op_impl(const Scalar& low, const Scalar& high, Index num_steps) : - m_low(low), m_high(high), m_size1(num_steps==1 ? 1 : num_steps-1), m_step(num_steps==1 ? Scalar() : (high-low)/RealScalar(num_steps-1)), + m_low(low), m_high(high), m_size1(num_steps==1 ? 1 : num_steps-1), m_step(num_steps==1 ? Scalar() : Scalar((high-low)/RealScalar(num_steps-1))), m_flip(numext::abs(high)<numext::abs(low)) {} template<typename IndexType> EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE const Scalar operator() (IndexType i) const { if(m_flip) - return (i==0)? m_low : (m_high - RealScalar(m_size1-i)*m_step); + return (i==0)? m_low : Scalar(m_high - RealScalar(m_size1-i)*m_step); else - return (i==m_size1)? m_high : (m_low + RealScalar(i)*m_step); + return (i==m_size1)? m_high : Scalar(m_low + RealScalar(i)*m_step); } template<typename Packet, typename IndexType> |