12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unfortunately, Method typedefs do not work for non-class types.

release/4.3a0
dellaert 2014-12-12 10:55:36 +01:00
parent 8f27b048f1
commit 012827dc98
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtsam/nonlinear/Expression-inl.h
View File

@ -672,7 +672,6 @@ class UnaryExpression: public FunctionalNode<T, boost::mpl::vector<A1> >::type {
public:
typedef T (A1::*Method)(OJ1) const;
typedef boost::function<T(const A1&, OJ1)> Function;
typedef typename FunctionalNode<T, boost::mpl::vector<A1> >::type Base;
typedef typename Base::Record Record;
@ -721,7 +720,6 @@ class BinaryExpression:
public:
typedef T (A1::*Method)(const A2&, OJ1, OJ2) const;
typedef boost::function<T(const A1&, const A2&, OJ1, OJ2)> Function;
typedef typename FunctionalNode<T, boost::mpl::vector<A1, A2> >::type Base;
typedef typename Base::Record Record;
@ -779,7 +777,6 @@ class TernaryExpression:
public:
typedef T (A1::*Method)(const A2&, const A3&, OJ1, OJ2, OJ3) const;
typedef boost::function<T(const A1&, const A2&, const A3&, OJ1, OJ2, OJ3)> Function;
typedef typename FunctionalNode<T, boost::mpl::vector<A1, A2, A3> >::type Base;
typedef typename Base::Record Record;

10
gtsam/nonlinear/Expression.h
View File

@ -75,7 +75,7 @@ public:
/// Construct a nullary method expression
template<typename A>
Expression(const Expression<A>& expression,
typename UnaryExpression<T, A>::Method method) :
T (A::*method)(typename UnaryExpression<T, A>::OJ1) const) :
root_(new UnaryExpression<T, A>(boost::bind(method, _1, _2), expression)) {
}
@ -89,7 +89,8 @@ public:
/// Construct a unary method expression
template<typename A1, typename A2>
Expression(const Expression<A1>& expression1,
typename BinaryExpression<T, A1, A2>::Method method,
T (A1::*method)(const A2&, typename BinaryExpression<T, A1, A2>::OJ1,
typename BinaryExpression<T, A1, A2>::OJ2) const,
const Expression<A2>& expression2) :
root_(
new BinaryExpression<T, A1, A2>(boost::bind(method, _1, _2, _3, _4),
@ -106,7 +107,10 @@ public:
/// Construct a binary method expression
template<typename A1, typename A2, typename A3>
Expression(const Expression<A1>& expression1,
typename TernaryExpression<T, A1, A2, A3>::Method method,
T (A1::*method)(const A2&, const A3&,
typename TernaryExpression<T, A1, A2, A3>::OJ1,
typename TernaryExpression<T, A1, A2, A3>::OJ2,
typename TernaryExpression<T, A1, A2, A3>::OJ3) const,
const Expression<A2>& expression2, const Expression<A3>& expression3) :
root_(
new TernaryExpression<T, A1, A2, A3>(