Commit ffed05eb authored by Justin Carpentier's avatar Justin Carpentier Committed by GitHub
Browse files

Merge pull request #13 from jcarpent/devel

Sync devel branch with master + update test to properly work with boost python
parents 4c0c2779 eddbeee3
......@@ -132,7 +132,8 @@ public:
bool operator == (const Vec3fX& other) const
{
return equal(other, 0);
return (data[0] == other.data[0] && data[1] == other.data[1]
&& data[2] == other.data[2]);
}
bool operator != (const Vec3fX& other) const
......
......@@ -25,13 +25,13 @@ add_fcl_test(test_fcl_collision test_fcl_collision.cpp test_fcl_utility.cpp)
add_fcl_test(test_fcl_distance test_fcl_distance.cpp test_fcl_utility.cpp)
add_fcl_test(test_fcl_distance_lower_bound test_fcl_distance_lower_bound.cpp
test_fcl_utility.cpp)
add_fcl_test(test_fcl_geometric_shapes test_fcl_geometric_shapes.cpp test_fcl_utility.cpp)
#add_fcl_test(test_fcl_geometric_shapes test_fcl_geometric_shapes.cpp test_fcl_utility.cpp)
#add_fcl_test(test_fcl_broadphase test_fcl_broadphase.cpp test_fcl_utility.cpp)
#add_fcl_test(test_fcl_shape_mesh_consistency test_fcl_shape_mesh_consistency.cpp test_fcl_utility.cpp)
add_fcl_test(test_fcl_frontlist test_fcl_frontlist.cpp test_fcl_utility.cpp)
#add_fcl_test(test_fcl_math test_fcl_math.cpp test_fcl_utility.cpp)
add_fcl_test(test_fcl_sphere_capsule test_fcl_sphere_capsule.cpp)
#add_fcl_test(test_fcl_sphere_capsule test_fcl_sphere_capsule.cpp)
add_fcl_test(test_fcl_capsule_capsule test_fcl_capsule_capsule.cpp)
add_fcl_test(test_fcl_box_box_distance test_fcl_box_box_distance.cpp)
add_fcl_test(test_fcl_simple test_fcl_simple.cpp)
......
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2014, CNRS.
* Copyright (c) 2014-2016, CNRS-LAAS.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
......@@ -35,9 +35,11 @@
/** \author Florent Lamiraux <florent@laas.fr> */
#define BOOST_TEST_MODULE FCL_BOX_BOX
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <boost/test/included/unit_test.hpp>
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#include <cmath>
#include <hpp/fcl/distance.h>
......
......@@ -36,8 +36,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_BROADPHASE"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_BROADPHASE
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/config.h>
#include <hpp/fcl/broadphase/broadphase.h>
......
......@@ -35,8 +35,10 @@
/** \author Jeongseok Lee */
#define BOOST_TEST_MODULE "FCL_BVH_MODELS"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_BVH_MODELS
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include "hpp/fcl/BVH/BVH_model.h"
#include "hpp/fcl/math/transform.h"
......
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2014-2015, CNRS-LAAS and AIST
* Copyright (c) 2014-2016, CNRS-LAAS and AIST
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
......@@ -35,9 +35,12 @@
/** \author Florent Lamiraux */
#define BOOST_TEST_MODULE "FCL_GEOMETRIC_SHAPES"
#define BOOST_TEST_MODULE FCL_GEOMETRIC_SHAPES
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#include <boost/test/included/unit_test.hpp>
#include <cmath>
#include <hpp/fcl/distance.h>
......
......@@ -35,9 +35,12 @@
/** \author Florent Lamiraux */
#define BOOST_TEST_MODULE "FCL_GEOMETRIC_SHAPES"
#define BOOST_TEST_MODULE FCL_GEOMETRIC_SHAPES
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#include <boost/test/included/unit_test.hpp>
#include <cmath>
#include <hpp/fcl/distance.h>
......
......@@ -35,10 +35,12 @@
/** \author Karsten Knese <Karsten.Knese@googlemail.com> */
#define BOOST_TEST_MODULE "FCL_CAPSULE_CAPSULE"
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#define BOOST_TEST_MODULE FCL_CAPSULE_CAPSULE
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <boost/test/included/unit_test.hpp>
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#include <cmath>
#include <hpp/fcl/distance.h>
......
......@@ -35,8 +35,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_COLLISION"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_COLLISION
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/traversal/traversal_node_bvhs.h>
#include <hpp/fcl/traversal/traversal_node_setup.h>
......
......@@ -35,8 +35,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_DISTANCE"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_DISTANCE
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/traversal/traversal_node_bvhs.h>
#include <hpp/fcl/traversal/traversal_node_setup.h>
......
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2014, CNRS-LAAS
* Copyright (c) 2014-2016, CNRS-LAAS
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
......@@ -32,8 +32,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define BOOST_TEST_MODULE "FCL_DISTANCE_LOWER_BOUND"
# include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_DISTANCE_LOWER_BOUND
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
# include <boost/filesystem.hpp>
#include <hpp/fcl/fwd.hh>
......
......@@ -33,8 +33,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define BOOST_TEST_MODULE "FCL_EIGEN"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_EIGEN
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/config-fcl.hh>
#include <hpp/fcl/eigen/vec_3fx.h>
......
......@@ -36,8 +36,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_FRONT_LIST"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_FRONT_LIST
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/traversal/traversal_node_bvhs.h>
#include <hpp/fcl/traversal/traversal_node_setup.h>
......
......@@ -36,8 +36,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_GEOMETRIC_SHAPES"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_GEOMETRIC_SHAPES
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/narrowphase/narrowphase.h>
#include <hpp/fcl/collision.h>
......
......@@ -34,8 +34,10 @@
*/
#define BOOST_TEST_MODULE "FCL_MATH"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_MATH
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#if FCL_HAVE_EIGEN
#include <hpp/fcl/eigen/math_details.h>
......
/*
* Software License Agreement (BSD License)
*
* Copyright (c) 2014, CNRS
* Copyright (c) 2014-2016, CNRS-LAAS
* Author: Florent Lamiraux
* All rights reserved.
*
......@@ -33,7 +33,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#define BOOST_TEST_MODULE "FCL_DISTANCE_OBB"
#define BOOST_TEST_MODULE FCL_DISTANCE_OBB
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#define CHECK_CLOSE_TO_0(x, eps) BOOST_CHECK_CLOSE ((x + 1.0), (1.0), (eps))
#include <boost/test/included/unit_test.hpp>
......
......@@ -35,8 +35,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_OCTOMAP"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_OCTOMAP
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/octree.h>
#include <hpp/fcl/traversal/traversal_node_octree.h>
......
......@@ -35,8 +35,10 @@
/** \author Jia Pan */
#define BOOST_TEST_MODULE "FCL_SHAPE_MESH_CONSISTENCY"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_SHAPE_MESH_CONSISTENCY
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/narrowphase/narrowphase.h>
#include <hpp/fcl/shape/geometric_shape_to_BVH_model.h>
......
#define BOOST_TEST_MODULE "FCL_SIMPLE"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_SIMPLE
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/intersect.h>
#include <hpp/fcl/collision.h>
......
......@@ -35,8 +35,10 @@
/** \author Martin Felis <martin.felis@iwr.uni-heidelberg.de> */
#define BOOST_TEST_MODULE "FCL_SPHERE_CAPSULE"
#include <boost/test/included/unit_test.hpp>
#define BOOST_TEST_MODULE FCL_SPHERE_CAPSULE
#define BOOST_TEST_DYN_LINK
#include <boost/test/unit_test.hpp>
#include <boost/utility/binary.hpp>
#include <hpp/fcl/collision.h>
#include <hpp/fcl/shape/geometric_shapes.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment