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

Fixed the product compilation

release/4.3a0
Paul Furgale 2014-09-29 07:22:25 +02:00
parent 10a35f3535
commit de3e1c3ed1
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam_unstable/base/tests/testBAD.cpp
View File

@ -139,7 +139,8 @@ class UnaryExpression: public ExpressionNode<T> {
public: public:
typedef T (*function)(const E&, boost::optional<Matrix&>); //typedef T (*function)(const E&, boost::optional<Matrix&>);
typedef boost::function<T(const E&, boost::optional<Matrix&>)> function;
private: private:
@ -191,9 +192,10 @@ class BinaryExpression: public ExpressionNode<T> {
public: public:
typedef T (*function)(const E1&, const E2&, boost::optional<Matrix&>, //typedef T (*function)(const E1&, const E2&, boost::optional<Matrix&>,
boost::optional<Matrix&>); // boost::optional<Matrix&>);
typedef boost::function<T(const E1&, const E2&, boost::optional<Matrix&>,
boost::optional<Matrix&>)> function;
private: private:
boost::shared_ptr<ExpressionNode<E1> > expression1_; boost::shared_ptr<ExpressionNode<E1> > expression1_;
@ -461,7 +463,7 @@ TEST(BAD, test) {
// Create expression tree // Create expression tree
Expression<Point3> p_cam(transformTo, x, p); Expression<Point3> p_cam(transformTo, x, p);
Expression<Point2> projection(project, p_cam); Expression<Point2> projection(project, p_cam);
Expression<Point2> uv_hat(uncalibrate, K, projection); Expression<Point2> uv_hat(uncalibrate<Cal3_S2>, K, projection);
// Check keys // Check keys
std::set<Key> expectedKeys; std::set<Key> expectedKeys;
@ -489,7 +491,7 @@ TEST(BAD, test) {
TEST(BAD, compose) { TEST(BAD, compose) {
Expression<Rot3> R1(1), R2(2); Expression<Rot3> R1(1), R2(2);
// Expression<Rot3> R3 = R1 * R2; Expression<Rot3> R3 = R1 * R2;
} }
/* ************************************************************************* */ /* ************************************************************************* */