* 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)
This commit is contained in:
Gael Guennebaud
2008-03-06 11:36:27 +00:00
parent 8e0d548039
commit 138aad0ed0
17 changed files with 257 additions and 338 deletions

View File

@@ -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;
}