diff --git a/Eigen/src/Core/CwiseNullaryOp.h b/Eigen/src/Core/CwiseNullaryOp.h index 0f914e7ca..691bc3663 100644 --- a/Eigen/src/Core/CwiseNullaryOp.h +++ b/Eigen/src/Core/CwiseNullaryOp.h @@ -238,9 +238,19 @@ bool MatrixBase::isApproxToConstant return true; } +/** Alias for setConstant(): sets all coefficients in this expression to \a value. + * + * \sa setConstant(), Constant(), class CwiseNullaryOp + */ +template +EIGEN_STRONG_INLINE void MatrixBase::fill(const Scalar& value) +{ + setConstant(value); +} + /** Sets all coefficients in this expression to \a value. * - * \sa class CwiseNullaryOp, Zero(), Ones() + * \sa fill(), Constant(), class CwiseNullaryOp, setZero(), setOnes() */ template EIGEN_STRONG_INLINE Derived& MatrixBase::setConstant(const Scalar& value) diff --git a/Eigen/src/Core/MatrixBase.h b/Eigen/src/Core/MatrixBase.h index 41dd894d7..5281e34fa 100644 --- a/Eigen/src/Core/MatrixBase.h +++ b/Eigen/src/Core/MatrixBase.h @@ -446,6 +446,7 @@ template class MatrixBase const DiagonalMatrix asDiagonal() const; + void fill(const Scalar& value); Derived& setConstant(const Scalar& value); Derived& setZero(); Derived& setOnes(); diff --git a/test/cwiseop.cpp b/test/cwiseop.cpp index 01f636147..3d98845b1 100644 --- a/test/cwiseop.cpp +++ b/test/cwiseop.cpp @@ -46,6 +46,7 @@ template void cwiseops(const MatrixType& m) MatrixType m1 = MatrixType::Random(rows, cols), m2 = MatrixType::Random(rows, cols), m3(rows, cols), + m4(rows, cols), mzero = MatrixType::Zero(rows, cols), mones = MatrixType::Ones(rows, cols), identity = Matrix @@ -57,6 +58,24 @@ template void cwiseops(const MatrixType& m) int r = ei_random(0, rows-1), c = ei_random(0, cols-1); + + Scalar s1 = ei_random(); + + // test Zero, Ones, Constant, and the set* variants + m3 = MatrixType::Constant(rows, cols, s1); + for (int j=0; j >(mones); @@ -85,9 +104,13 @@ template void cwiseops(const MatrixType& m) VERIFY_IS_APPROX(m3.cwise().square(), m1.cwise().abs()); VERIFY_IS_APPROX(m1.cwise().square().cwise().sqrt(), m1.cwise().abs()); VERIFY_IS_APPROX(m1.cwise().abs().cwise().log().cwise().exp() , m1.cwise().abs()); + + VERIFY_IS_APPROX(m1.cwise().pow(2), m1.cwise().square()); + m3 = (m1.cwise().abs().cwise()<0.01).select(mones,m1); + VERIFY_IS_APPROX(m3.cwise().pow(-1), m3.cwise().inverse()); + m3 = m1.cwise().abs(); + VERIFY_IS_APPROX(m3.cwise().pow(0.5), m3.cwise().sqrt()); -// VERIFY_IS_APPROX(m1.cwise().pow(-1), m1.cwise().inverse()); -// VERIFY_IS_APPROX(m1.cwise().pow(0.5), m1.cwise().sqrt()); // VERIFY_IS_APPROX(m1.cwise().tan(), m1.cwise().sin().cwise() / m1.cwise().cos()); VERIFY_IS_APPROX(mones, m1.cwise().sin().cwise().square() + m1.cwise().cos().cwise().square()); m3 = m1;