mirror of
https://gitlab.com/libeigen/eigen.git
synced 2025-07-03 19:55:15 +08:00
Enable visitor on empty matrices (the visitor is left unchanged), and protect min/maxCoeff(Index*,Index*) on empty matrices by an assertion (+ doc & unit tests)
This commit is contained in:
parent
027e44ed24
commit
6ec6bf0b0d
@ -397,6 +397,8 @@ public:
|
|||||||
* The template parameter \a BinaryOp is the type of the functor \a func which must be
|
* The template parameter \a BinaryOp is the type of the functor \a func which must be
|
||||||
* an associative operator. Both current C++98 and C++11 functor styles are handled.
|
* an associative operator. Both current C++98 and C++11 functor styles are handled.
|
||||||
*
|
*
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
|
*
|
||||||
* \sa DenseBase::sum(), DenseBase::minCoeff(), DenseBase::maxCoeff(), MatrixBase::colwise(), MatrixBase::rowwise()
|
* \sa DenseBase::sum(), DenseBase::minCoeff(), DenseBase::maxCoeff(), MatrixBase::colwise(), MatrixBase::rowwise()
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
@ -415,6 +417,7 @@ DenseBase<Derived>::redux(const Func& func) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** \returns the minimum of all coefficients of \c *this.
|
/** \returns the minimum of all coefficients of \c *this.
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
@ -425,6 +428,7 @@ DenseBase<Derived>::minCoeff() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** \returns the maximum of all coefficients of \c *this.
|
/** \returns the maximum of all coefficients of \c *this.
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
|
@ -40,6 +40,14 @@ struct visitor_impl<Visitor, Derived, 1>
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// This specialization enables visitors on empty matrices at compile-time
|
||||||
|
template<typename Visitor, typename Derived>
|
||||||
|
struct visitor_impl<Visitor, Derived, 0> {
|
||||||
|
EIGEN_DEVICE_FUNC
|
||||||
|
static inline void run(const Derived &/*mat*/, Visitor& /*visitor*/)
|
||||||
|
{}
|
||||||
|
};
|
||||||
|
|
||||||
template<typename Visitor, typename Derived>
|
template<typename Visitor, typename Derived>
|
||||||
struct visitor_impl<Visitor, Derived, Dynamic>
|
struct visitor_impl<Visitor, Derived, Dynamic>
|
||||||
{
|
{
|
||||||
@ -99,6 +107,8 @@ protected:
|
|||||||
* \note compared to one or two \em for \em loops, visitors offer automatic
|
* \note compared to one or two \em for \em loops, visitors offer automatic
|
||||||
* unrolling for small fixed size matrix.
|
* unrolling for small fixed size matrix.
|
||||||
*
|
*
|
||||||
|
* \note if the matrix is empty, then the visitor is left unchanged.
|
||||||
|
*
|
||||||
* \sa minCoeff(Index*,Index*), maxCoeff(Index*,Index*), DenseBase::redux()
|
* \sa minCoeff(Index*,Index*), maxCoeff(Index*,Index*), DenseBase::redux()
|
||||||
*/
|
*/
|
||||||
template<typename Derived>
|
template<typename Derived>
|
||||||
@ -106,6 +116,9 @@ template<typename Visitor>
|
|||||||
EIGEN_DEVICE_FUNC
|
EIGEN_DEVICE_FUNC
|
||||||
void DenseBase<Derived>::visit(Visitor& visitor) const
|
void DenseBase<Derived>::visit(Visitor& visitor) const
|
||||||
{
|
{
|
||||||
|
if(size()==0)
|
||||||
|
return;
|
||||||
|
|
||||||
typedef typename internal::visitor_evaluator<Derived> ThisEvaluator;
|
typedef typename internal::visitor_evaluator<Derived> ThisEvaluator;
|
||||||
ThisEvaluator thisEval(derived());
|
ThisEvaluator thisEval(derived());
|
||||||
|
|
||||||
@ -196,6 +209,9 @@ struct functor_traits<max_coeff_visitor<Scalar> > {
|
|||||||
|
|
||||||
/** \fn DenseBase<Derived>::minCoeff(IndexType* rowId, IndexType* colId) const
|
/** \fn DenseBase<Derived>::minCoeff(IndexType* rowId, IndexType* colId) const
|
||||||
* \returns the minimum of all coefficients of *this and puts in *row and *col its location.
|
* \returns the minimum of all coefficients of *this and puts in *row and *col its location.
|
||||||
|
*
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
|
*
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*
|
*
|
||||||
* \sa DenseBase::minCoeff(Index*), DenseBase::maxCoeff(Index*,Index*), DenseBase::visit(), DenseBase::minCoeff()
|
* \sa DenseBase::minCoeff(Index*), DenseBase::maxCoeff(Index*,Index*), DenseBase::visit(), DenseBase::minCoeff()
|
||||||
@ -206,6 +222,8 @@ EIGEN_DEVICE_FUNC
|
|||||||
typename internal::traits<Derived>::Scalar
|
typename internal::traits<Derived>::Scalar
|
||||||
DenseBase<Derived>::minCoeff(IndexType* rowId, IndexType* colId) const
|
DenseBase<Derived>::minCoeff(IndexType* rowId, IndexType* colId) const
|
||||||
{
|
{
|
||||||
|
eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix");
|
||||||
|
|
||||||
internal::min_coeff_visitor<Derived> minVisitor;
|
internal::min_coeff_visitor<Derived> minVisitor;
|
||||||
this->visit(minVisitor);
|
this->visit(minVisitor);
|
||||||
*rowId = minVisitor.row;
|
*rowId = minVisitor.row;
|
||||||
@ -214,6 +232,9 @@ DenseBase<Derived>::minCoeff(IndexType* rowId, IndexType* colId) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** \returns the minimum of all coefficients of *this and puts in *index its location.
|
/** \returns the minimum of all coefficients of *this and puts in *index its location.
|
||||||
|
*
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
|
*
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*
|
*
|
||||||
* \sa DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::maxCoeff(IndexType*,IndexType*), DenseBase::visit(), DenseBase::minCoeff()
|
* \sa DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::maxCoeff(IndexType*,IndexType*), DenseBase::visit(), DenseBase::minCoeff()
|
||||||
@ -224,6 +245,8 @@ EIGEN_DEVICE_FUNC
|
|||||||
typename internal::traits<Derived>::Scalar
|
typename internal::traits<Derived>::Scalar
|
||||||
DenseBase<Derived>::minCoeff(IndexType* index) const
|
DenseBase<Derived>::minCoeff(IndexType* index) const
|
||||||
{
|
{
|
||||||
|
eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix");
|
||||||
|
|
||||||
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
||||||
internal::min_coeff_visitor<Derived> minVisitor;
|
internal::min_coeff_visitor<Derived> minVisitor;
|
||||||
this->visit(minVisitor);
|
this->visit(minVisitor);
|
||||||
@ -233,6 +256,9 @@ DenseBase<Derived>::minCoeff(IndexType* index) const
|
|||||||
|
|
||||||
/** \fn DenseBase<Derived>::maxCoeff(IndexType* rowId, IndexType* colId) const
|
/** \fn DenseBase<Derived>::maxCoeff(IndexType* rowId, IndexType* colId) const
|
||||||
* \returns the maximum of all coefficients of *this and puts in *row and *col its location.
|
* \returns the maximum of all coefficients of *this and puts in *row and *col its location.
|
||||||
|
*
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
|
*
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*
|
*
|
||||||
* \sa DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::visit(), DenseBase::maxCoeff()
|
* \sa DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::visit(), DenseBase::maxCoeff()
|
||||||
@ -243,6 +269,8 @@ EIGEN_DEVICE_FUNC
|
|||||||
typename internal::traits<Derived>::Scalar
|
typename internal::traits<Derived>::Scalar
|
||||||
DenseBase<Derived>::maxCoeff(IndexType* rowPtr, IndexType* colPtr) const
|
DenseBase<Derived>::maxCoeff(IndexType* rowPtr, IndexType* colPtr) const
|
||||||
{
|
{
|
||||||
|
eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix");
|
||||||
|
|
||||||
internal::max_coeff_visitor<Derived> maxVisitor;
|
internal::max_coeff_visitor<Derived> maxVisitor;
|
||||||
this->visit(maxVisitor);
|
this->visit(maxVisitor);
|
||||||
*rowPtr = maxVisitor.row;
|
*rowPtr = maxVisitor.row;
|
||||||
@ -251,6 +279,9 @@ DenseBase<Derived>::maxCoeff(IndexType* rowPtr, IndexType* colPtr) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** \returns the maximum of all coefficients of *this and puts in *index its location.
|
/** \returns the maximum of all coefficients of *this and puts in *index its location.
|
||||||
|
*
|
||||||
|
* \warning the matrix must be not empty, otherwise an assertion is triggered.
|
||||||
|
*
|
||||||
* \warning the result is undefined if \c *this contains NaN.
|
* \warning the result is undefined if \c *this contains NaN.
|
||||||
*
|
*
|
||||||
* \sa DenseBase::maxCoeff(IndexType*,IndexType*), DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::visitor(), DenseBase::maxCoeff()
|
* \sa DenseBase::maxCoeff(IndexType*,IndexType*), DenseBase::minCoeff(IndexType*,IndexType*), DenseBase::visitor(), DenseBase::maxCoeff()
|
||||||
@ -261,6 +292,8 @@ EIGEN_DEVICE_FUNC
|
|||||||
typename internal::traits<Derived>::Scalar
|
typename internal::traits<Derived>::Scalar
|
||||||
DenseBase<Derived>::maxCoeff(IndexType* index) const
|
DenseBase<Derived>::maxCoeff(IndexType* index) const
|
||||||
{
|
{
|
||||||
|
eigen_assert(this->rows()>0 && this->cols()>0 && "you are using an empty matrix");
|
||||||
|
|
||||||
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
EIGEN_STATIC_ASSERT_VECTOR_ONLY(Derived)
|
||||||
internal::max_coeff_visitor<Derived> maxVisitor;
|
internal::max_coeff_visitor<Derived> maxVisitor;
|
||||||
this->visit(maxVisitor);
|
this->visit(maxVisitor);
|
||||||
|
@ -23,6 +23,11 @@ template<typename MatrixType> void zeroReduction(const MatrixType& m) {
|
|||||||
VERIFY(!m.hasNaN());
|
VERIFY(!m.hasNaN());
|
||||||
VERIFY_RAISES_ASSERT( m.minCoeff() );
|
VERIFY_RAISES_ASSERT( m.minCoeff() );
|
||||||
VERIFY_RAISES_ASSERT( m.maxCoeff() );
|
VERIFY_RAISES_ASSERT( m.maxCoeff() );
|
||||||
|
Index i,j;
|
||||||
|
VERIFY_RAISES_ASSERT( m.minCoeff(&i,&j) );
|
||||||
|
VERIFY_RAISES_ASSERT( m.maxCoeff(&i,&j) );
|
||||||
|
VERIFY_RAISES_ASSERT( m.reshaped().minCoeff(&i) );
|
||||||
|
VERIFY_RAISES_ASSERT( m.reshaped().maxCoeff(&i) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user