From 138aad0ed03cb9045b1f74ce52f0e47ce02966c8 Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Thu, 6 Mar 2008 11:36:27 +0000 Subject: * coefficient wise operators are more generic, with controllable result type. - compatible with current STL's functors as well as with the extention proposal (TR1) * thanks to the above, Cast and ScalarMultiple have been removed * benchmark_suite is more flexible (compiler and matrix size) --- doc/examples/class_CwiseBinaryOp.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'doc/examples/class_CwiseBinaryOp.cpp') diff --git a/doc/examples/class_CwiseBinaryOp.cpp b/doc/examples/class_CwiseBinaryOp.cpp index 9bb10cdcb..f5439a434 100644 --- a/doc/examples/class_CwiseBinaryOp.cpp +++ b/doc/examples/class_CwiseBinaryOp.cpp @@ -3,9 +3,9 @@ USING_PART_OF_NAMESPACE_EIGEN using namespace std; // define a custom template binary functor -struct CwiseMinOp { +struct CwiseMinOp EIGEN_EMPTY_STRUCT { template - static Scalar op(const Scalar& a, const Scalar& b) { return std::min(a,b); } + Scalar operator()(const Scalar& a, const Scalar& b) const { return std::min(a,b); } }; // define a custom binary operator between two matrices @@ -14,14 +14,13 @@ const Eigen::CwiseBinaryOp cwiseMin(const MatrixBase &mat1, const MatrixBase &mat2) { return Eigen::CwiseBinaryOp(mat1.asArg(), mat2.asArg()); - // Note that the above is equivalent to: - // return mat1.template cwise(mat2); } int main(int, char**) { Matrix4d m1 = Matrix4d::random(), m2 = Matrix4d::random(); - cout << cwiseMin(m1,m2) << endl; // use our new global operator - cout << m1.cwise(m2) << endl; // directly use the generic expression member + cout << cwiseMin(m1,m2) << endl; // use our new global operator + cout << m1.cwise(m2) << endl; // directly use the generic expression member + cout << m1.cwise(m2, CwiseMinOp()) << endl; // directly use the generic expression member (variant) return 0; } -- cgit v1.2.3