diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-03-26 08:48:04 +0000 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-03-26 08:48:04 +0000 |
| commit | 729618c945aaf5183316abd1badc4921cecd86f1 (patch) | |
| tree | 99b44a2974698f622180721334f1f1c07d91423e /Eigen/src/Core/Map.h | |
| parent | 4342f024d9937beaff70635d2e2cb1ad6574bf72 (diff) | |
* #define EIGEN_NDEBUG now also disables asserts. Useful
to disable eigen's asserts without disabling one's own program's
asserts. Notice that Eigen code should now use ei_assert()
instead of assert().
* Remove findBiggestCoeff() as it's now almost redundant.
* Improve echelon.cpp: inner for loop replaced by xprs.
* remove useless "(*this)." here and there. I think they were
first introduced by automatic search&replace.
* fix compilation in Visitor.h (issue triggered by echelon.cpp)
* improve comment on swap().
Diffstat (limited to 'Eigen/src/Core/Map.h')
| -rw-r--r-- | Eigen/src/Core/Map.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Map.h b/Eigen/src/Core/Map.h index d0f9cd940..5d08ef542 100644 --- a/Eigen/src/Core/Map.h +++ b/Eigen/src/Core/Map.h @@ -81,7 +81,7 @@ template<typename MatrixType> class Map public: Map(const Scalar* data, int rows, int cols) : m_data(data), m_rows(rows), m_cols(cols) { - assert(rows > 0 + ei_assert(rows > 0 && (RowsAtCompileTime == Dynamic || RowsAtCompileTime == rows) && cols > 0 && (ColsAtCompileTime == Dynamic || ColsAtCompileTime == cols)); @@ -107,7 +107,7 @@ template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder, int _MaxRows const Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder, _MaxRows, _MaxCols> > Matrix<_Scalar, _Rows, _Cols, _StorageOrder, _MaxRows, _MaxCols>::map(const Scalar* data, int size) { - assert(_Cols == 1 || _Rows ==1); + ei_assert(_Cols == 1 || _Rows ==1); if(_Cols == 1) return Map<Matrix>(data, size, 1); else @@ -156,7 +156,7 @@ template<typename _Scalar, int _Rows, int _Cols, int _StorageOrder, int _MaxRows Map<Matrix<_Scalar, _Rows, _Cols, _StorageOrder, _MaxRows, _MaxCols> > Matrix<_Scalar, _Rows, _Cols, _StorageOrder, _MaxRows, _MaxCols>::map(Scalar* data, int size) { - assert(_Cols == 1 || _Rows ==1); + ei_assert(_Cols == 1 || _Rows ==1); if(_Cols == 1) return Map<Matrix>(data, size, 1); else |