* 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)

3 files changed, 25 insertions, 12 deletions

diff --git a/doc/examples/class_Cast.cpp b/doc/examples/class_Cast.cpp
index 9751b05c1..88549732f 100644
--- a/doc/examples/class_Cast.cpp
+++ b/doc/examples/class_Cast.cpp
@@ -3,16 +3,13 @@ USING_PART_OF_NAMESPACE_EIGEN
 using namespace std;
 
 template<typename Scalar, typename Derived>
-const Eigen::Cast<
-  typename Eigen::NumTraits<Scalar>::FloatingPoint,
+const Eigen::CwiseUnaryOp<
+  Eigen::ScalarCastOp<typename Eigen::NumTraits<Scalar>::FloatingPoint>,
   Derived
 >
 castToFloatingPoint(const MatrixBase<Scalar, Derived>& m)
 {
-  return Eigen::Cast<
-    typename Eigen::NumTraits<Scalar>::FloatingPoint,
-    Derived
-  >(m.asArg());
+  return m.template cast<typename Eigen::NumTraits<Scalar>::FloatingPoint>();
 }
 
 int main(int, char**)
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;
 }
diff --git a/doc/examples/class_CwiseUnaryOp.cpp b/doc/examples/class_CwiseUnaryOp.cpp
new file mode 100644
index 000000000..e10037352
--- /dev/null
+++ b/doc/examples/class_CwiseUnaryOp.cpp
@@ -0,0 +1,17 @@
+#include <Eigen/Core>
+USING_PART_OF_NAMESPACE_EIGEN
+using namespace std;
+
+// define a custom template binary functor
+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); }
+};
+
+int main(int, char**)
+{
+  Matrix4d m1 = Matrix4d::random(), m2 = Matrix4d::random();
+  cout << m1.cwise(m2, CwiseClampOp<Matrix4d::Scalar>(-0.5,0.5)) << endl;
+  return 0;
+}