diff options
author | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-04-03 11:10:17 +0000 |
---|---|---|
committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2008-04-03 11:10:17 +0000 |
commit | d1a29d6319d6919e0c3d1c624ad45d8202be1942 (patch) | |
tree | b9882a823c7d08819037d341f7e61971304eeadf /doc | |
parent | e74fbfb2bc13dee268950361a957aea73bcefc21 (diff) |
-new: recursive costs system, useful to determine automatically
when to evaluate arguments and when to meta-unroll.
-use it in Product to determine when to eval args. not yet used
to determine when to unroll. for now, not used anywhere else but
that'll follow.
-fix badness of my last commit
Diffstat (limited to 'doc')
-rw-r--r-- | doc/echelon.cpp | 7 | ||||
-rw-r--r-- | doc/examples/class_CwiseBinaryOp.cpp | 15 | ||||
-rw-r--r-- | doc/examples/class_CwiseUnaryOp.cpp | 7 |
3 files changed, 14 insertions, 15 deletions
diff --git a/doc/echelon.cpp b/doc/echelon.cpp index d28726b0f..e305eb238 100644 --- a/doc/echelon.cpp +++ b/doc/echelon.cpp @@ -16,13 +16,8 @@ void echelon(MatrixBase<Derived>& m) .maxCoeff(&rowOfBiggest, &colOfBiggest); m.row(k).swap(m.row(k+rowOfBiggest)); m.col(k).swap(m.col(k+colOfBiggest)); - // important performance tip: - // in a complex expression such as below it can be very important to fine-tune - // exactly where evaluation occurs. The parentheses and .eval() below ensure - // that the quotient is computed only once, and that the evaluation caused - // by operator* occurs last. m.corner(BottomRight, cornerRows-1, cornerCols) - -= m.col(k).end(cornerRows-1) * (m.row(k).end(cornerCols) / m(k,k)).eval(); + -= m.col(k).end(cornerRows-1) * (m.row(k).end(cornerCols) / m(k,k)); } } diff --git a/doc/examples/class_CwiseBinaryOp.cpp b/doc/examples/class_CwiseBinaryOp.cpp index 8e4c5361e..b91abd1ef 100644 --- a/doc/examples/class_CwiseBinaryOp.cpp +++ b/doc/examples/class_CwiseBinaryOp.cpp @@ -1,26 +1,29 @@ +// FIXME - this example is not too good as that functionality is provided in the Eigen API +// additionally it's quite heavy. the CwiseUnaryOp example is better. + #include <Eigen/Core> USING_PART_OF_NAMESPACE_EIGEN using namespace std; // define a custom template binary functor -struct CwiseMinOp EIGEN_EMPTY_STRUCT { - template<typename Scalar> +template<typename Scalar> struct CwiseMinOp EIGEN_EMPTY_STRUCT { Scalar operator()(const Scalar& a, const Scalar& b) const { return std::min(a,b); } + enum { Cost = Eigen::ConditionalJumpCost + Eigen::NumTraits<Scalar>::AddCost }; }; // define a custom binary operator between two matrices template<typename Derived1, typename Derived2> -const Eigen::CwiseBinaryOp<CwiseMinOp, Derived1, Derived2> +const Eigen::CwiseBinaryOp<CwiseMinOp<typename Derived1::Scalar>, Derived1, Derived2> cwiseMin(const MatrixBase<Derived1> &mat1, const MatrixBase<Derived2> &mat2) { - return Eigen::CwiseBinaryOp<CwiseMinOp, Derived1, Derived2>(mat1, mat2); + return Eigen::CwiseBinaryOp<CwiseMinOp<typename Derived1::Scalar>, Derived1, Derived2>(mat1, 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 << m1.cwise(m2, CwiseMinOp()) << endl; // directly use the generic expression member (variant) + cout << m1.cwise<CwiseMinOp<double> >(m2) << endl; // directly use the generic expression member + cout << m1.cwise(m2, CwiseMinOp<double>()) << endl; // directly use the generic expression member (variant) return 0; } diff --git a/doc/examples/class_CwiseUnaryOp.cpp b/doc/examples/class_CwiseUnaryOp.cpp index 042e051e9..ea27876eb 100644 --- a/doc/examples/class_CwiseUnaryOp.cpp +++ b/doc/examples/class_CwiseUnaryOp.cpp @@ -5,9 +5,10 @@ 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); } - Scalar m_inf, m_sup; + CwiseClampOp(const Scalar& inf, const Scalar& sup) : m_inf(inf), m_sup(sup) {} + const Scalar operator()(const Scalar& x) const { return x<m_inf ? m_inf : (x>m_sup ? m_sup : x); } + Scalar m_inf, m_sup; + enum { Cost = Eigen::ConditionalJumpCost + Eigen::NumTraits<Scalar>::AddCost }; }; int main(int, char**) |