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/CommaInitializer.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/CommaInitializer.h')
-rw-r--r-- | Eigen/src/Core/CommaInitializer.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/Core/CommaInitializer.h b/Eigen/src/Core/CommaInitializer.h index c7a292437..656ee3002 100644 --- a/Eigen/src/Core/CommaInitializer.h +++ b/Eigen/src/Core/CommaInitializer.h @@ -52,12 +52,12 @@ struct MatrixBase<Derived>::CommaInitializer m_row+=m_currentBlockRows; m_col = 0; m_currentBlockRows = 1; - assert(m_row<m_matrix.rows() + ei_assert(m_row<m_matrix.rows() && "Too many rows passed to MatrixBase::operator<<"); } - assert(m_col<m_matrix.cols() + ei_assert(m_col<m_matrix.cols() && "Too many coefficients passed to MatrixBase::operator<<"); - assert(m_currentBlockRows==1); + ei_assert(m_currentBlockRows==1); m_matrix.coeffRef(m_row, m_col++) = s; return *this; } @@ -70,12 +70,12 @@ struct MatrixBase<Derived>::CommaInitializer m_row+=m_currentBlockRows; m_col = 0; m_currentBlockRows = other.rows(); - assert(m_row+m_currentBlockRows<=m_matrix.rows() + ei_assert(m_row+m_currentBlockRows<=m_matrix.rows() && "Too many rows passed to MatrixBase::operator<<"); } - assert(m_col<m_matrix.cols() + ei_assert(m_col<m_matrix.cols() && "Too many coefficients passed to MatrixBase::operator<<"); - assert(m_currentBlockRows==other.rows()); + ei_assert(m_currentBlockRows==other.rows()); if (OtherDerived::RowsAtCompileTime>0 && OtherDerived::ColsAtCompileTime>0) m_matrix.block< (OtherDerived::RowsAtCompileTime>0?OtherDerived::RowsAtCompileTime:1) , (OtherDerived::ColsAtCompileTime>0?OtherDerived::ColsAtCompileTime:1) >(m_row, m_col) = other; @@ -87,7 +87,7 @@ struct MatrixBase<Derived>::CommaInitializer ~CommaInitializer(void) { - assert((m_row+m_currentBlockRows) == m_matrix.rows() + ei_assert((m_row+m_currentBlockRows) == m_matrix.rows() && m_col == m_matrix.cols() && "Too few coefficients passed to Matrix::operator<<"); } |