GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-14 00:51:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug #384: add a static assertion on the Index type which has to be signed

Browse Source
This commit is contained in:
Gael Guennebaud 2011-12-04 22:14:53 +01:00
parent 82f9aa194d
commit b60624dc2a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Eigen/src/Core/util/StaticAssert.h
View File

@ -100,7 +100,8 @@
THIS_METHOD_IS_ONLY_FOR_EXPRESSIONS_OF_BOOL, THIS_METHOD_IS_ONLY_FOR_EXPRESSIONS_OF_BOOL,
THIS_METHOD_IS_ONLY_FOR_ARRAYS_NOT_MATRICES, THIS_METHOD_IS_ONLY_FOR_ARRAYS_NOT_MATRICES,
YOU_PASSED_A_ROW_VECTOR_BUT_A_COLUMN_VECTOR_WAS_EXPECTED, YOU_PASSED_A_ROW_VECTOR_BUT_A_COLUMN_VECTOR_WAS_EXPECTED,
YOU_PASSED_A_COLUMN_VECTOR_BUT_A_ROW_VECTOR_WAS_EXPECTED YOU_PASSED_A_COLUMN_VECTOR_BUT_A_ROW_VECTOR_WAS_EXPECTED,
THE_INDEX_TYPE_MUST_BE_A_SIGNED_TYPE
}; };
}; };

11
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -45,7 +45,7 @@
* \tparam _Scalar the scalar type, i.e. the type of the coefficients * \tparam _Scalar the scalar type, i.e. the type of the coefficients
* \tparam _Options Union of bit flags controlling the storage scheme. Currently the only possibility * \tparam _Options Union of bit flags controlling the storage scheme. Currently the only possibility
* is RowMajor. The default is 0 which means column-major. * is RowMajor. The default is 0 which means column-major.
* \tparam _Index the type of the indices. Default is \c int. * \tparam _Index the type of the indices. It has to be a \b signed type (e.g., short, int, std::ptrdiff_t). Default is \c int.
* *
* This class can be extended with the help of the plugin mechanism described on the page * This class can be extended with the help of the plugin mechanism described on the page
* \ref TopicCustomizingEigen by defining the preprocessor symbol \c EIGEN_SPARSEMATRIX_PLUGIN. * \ref TopicCustomizingEigen by defining the preprocessor symbol \c EIGEN_SPARSEMATRIX_PLUGIN.
@ -543,6 +543,7 @@ class SparseMatrix
inline SparseMatrix() inline SparseMatrix()
: m_outerSize(-1), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0) : m_outerSize(-1), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0)
{ {
check_template_parameters();
resize(0, 0); resize(0, 0);
} }
@ -550,6 +551,7 @@ class SparseMatrix
inline SparseMatrix(Index rows, Index cols) inline SparseMatrix(Index rows, Index cols)
: m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0) : m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0)
{ {
check_template_parameters();
resize(rows, cols); resize(rows, cols);
} }
@ -558,6 +560,7 @@ class SparseMatrix
inline SparseMatrix(const SparseMatrixBase<OtherDerived>& other) inline SparseMatrix(const SparseMatrixBase<OtherDerived>& other)
: m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0) : m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0)
{ {
check_template_parameters();
*this = other.derived(); *this = other.derived();
} }
@ -565,6 +568,7 @@ class SparseMatrix
inline SparseMatrix(const SparseMatrix& other) inline SparseMatrix(const SparseMatrix& other)
: Base(), m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0) : Base(), m_outerSize(0), m_innerSize(0), m_outerIndex(0), m_innerNonZeros(0)
{ {
check_template_parameters();
*this = other.derived(); *this = other.derived();
} }
@ -877,6 +881,11 @@ protected:
} }
private: private:
static void check_template_parameters()
{
EIGEN_STATIC_ASSERT(NumTraits<Index>::IsSigned,THE_INDEX_TYPE_MUST_BE_A_SIGNED_TYPE);
}
struct default_prunning_func { struct default_prunning_func {
default_prunning_func(Scalar ref, RealScalar eps) : reference(ref), epsilon(eps) {} default_prunning_func(Scalar ref, RealScalar eps) : reference(ref), epsilon(eps) {}
inline bool operator() (const Index&, const Index&, const Scalar& value) const inline bool operator() (const Index&, const Index&, const Scalar& value) const