diff options
author | Gael Guennebaud <g.gael@free.fr> | 2008-03-08 19:02:24 +0000 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2008-03-08 19:02:24 +0000 |
commit | 721626dfc5cab61ded1a26357b6c3dbb33763dc0 (patch) | |
tree | b0ca850c64a5bfccdd300cb49baf2e469640d276 /doc/examples/class_CwiseUnaryOp.cpp | |
parent | 138aad0ed03cb9045b1f74ce52f0e47ce02966c8 (diff) |
* Added support for a comma initializer: mat.block(i,j,2,2) << 1, 2, 3, 4;
If the number of coefficients does not match the matrix size, then an assertion is raised.
No support for xpr on the right side for the moment.
* Added support for assertion checking. This allows to test that an assertion is indeed raised
when it should be.
* Fixed a mistake in the CwiseUnary example.
Diffstat (limited to 'doc/examples/class_CwiseUnaryOp.cpp')
-rw-r--r-- | doc/examples/class_CwiseUnaryOp.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/examples/class_CwiseUnaryOp.cpp b/doc/examples/class_CwiseUnaryOp.cpp index e10037352..4d4bfe734 100644 --- a/doc/examples/class_CwiseUnaryOp.cpp +++ b/doc/examples/class_CwiseUnaryOp.cpp @@ -6,12 +6,13 @@ using namespace std; template<typename Scalar> struct CwiseClampOp EIGEN_EMPTY_STRUCT { CwiseClampOp(const Scalar& inf, const Scalar& sup) : m_inf(inf), m_sup(sup) {} - Scalar operator()(const Scalar& x) const { return x<m_inf ? m_inf : (x>m_sup : m_sup : x); } + Scalar operator()(const Scalar& x) const { return x<m_inf ? m_inf : (x>m_sup ? m_sup : x); } + Scalar m_inf, m_sup; }; int main(int, char**) { - Matrix4d m1 = Matrix4d::random(), m2 = Matrix4d::random(); - cout << m1.cwise(m2, CwiseClampOp<Matrix4d::Scalar>(-0.5,0.5)) << endl; + Matrix4d m1 = Matrix4d::random(); + cout << m1.cwise(CwiseClampOp<Matrix4d::Scalar>(-0.5,0.5)) << endl; return 0; } |