diff options
Diffstat (limited to 'doc/examples/class_CwiseBinaryOp.cpp')
| -rw-r--r-- | doc/examples/class_CwiseBinaryOp.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
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<typename Scalar> - 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<CwiseMinOp, Derived1, Derived2> cwiseMin(const MatrixBase<Scalar, Derived1> &mat1, const MatrixBase<Scalar, Derived2> &mat2) { return Eigen::CwiseBinaryOp<CwiseMinOp, Derived1, Derived2>(mat1.asArg(), mat2.asArg()); - // Note that the above is equivalent to: - // return mat1.template cwise<CwiseMinOp>(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<CwiseMinOp>(m2) << endl; // directly use the generic expression member + cout << cwiseMin(m1,m2) << endl; // use our new global operator + cout << m1.cwise<CwiseMinOp>(m2) << endl; // directly use the generic expression member + cout << m1.cwise(m2, CwiseMinOp()) << endl; // directly use the generic expression member (variant) return 0; } |