Split octomap test file into 3 test files

flexible-collision-library · Aug 9, 2016 · 741fd9d · 741fd9d
1 parent cf9b27a
commit 741fd9d
Show file tree

Hide file tree

Showing 10 changed files with 1,055 additions and 923 deletions.
diff --git a/include/fcl/traversal/traversal_node_base.h b/include/fcl/traversal/traversal_node_base.h
@@ -83,6 +83,8 @@ class TraversalNodeBase
 
   /// @brief configuration of second object
   Transform3<Scalar> tf2;
+
+  EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 };
 
 //============================================================================//

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -56,7 +56,9 @@ set(tests
 )
 
 if (FCL_HAVE_OCTOMAP)
-  list(APPEND tests test_fcl_octomap.cpp)
+  list(APPEND tests test_fcl_octomap_cost.cpp)
+  list(APPEND tests test_fcl_octomap_collision.cpp)
+  list(APPEND tests test_fcl_octomap_distance.cpp)
 endif()
 
 macro(add_fcl_test test_file_name)

diff --git a/test/test_fcl_broadphase_collision_1.cpp b/test/test_fcl_broadphase_collision_1.cpp
@@ -53,20 +53,6 @@
 
 using namespace fcl;
 
-struct TStruct
-{
-  std::vector<double> records;
-  double overall_time;
-
-  TStruct() { overall_time = 0; }
-
-  void push_back(double t)
-  {
-    records.push_back(t);
-    overall_time += t;
-  }
-};
-
 /// @brief test for broad phase update
 template <typename Scalar>
 void broad_phase_update_collision_test(Scalar env_scale, std::size_t env_size, std::size_t query_size, std::size_t num_max_contacts = 1, bool exhaustive = false, bool use_mesh = false);

diff --git a/test/test_fcl_broadphase_collision_2.cpp b/test/test_fcl_broadphase_collision_2.cpp
@@ -53,20 +53,6 @@
 
 using namespace fcl;
 
-struct TStruct
-{
-  std::vector<double> records;
-  double overall_time;
-
-  TStruct() { overall_time = 0; }
-
-  void push_back(double t)
-  {
-    records.push_back(t);
-    overall_time += t;
-  }
-};
-
 /// @brief test for broad phase collision and self collision
 template <typename Scalar>
 void broad_phase_collision_test(Scalar env_scale, std::size_t env_size, std::size_t query_size, std::size_t num_max_contacts = 1, bool exhaustive = false, bool use_mesh = false);

diff --git a/test/test_fcl_broadphase_distance.cpp b/test/test_fcl_broadphase_distance.cpp
@@ -53,20 +53,6 @@
 
 using namespace fcl;
 
-struct TStruct
-{
-  std::vector<double> records;
-  double overall_time;
-
-  TStruct() { overall_time = 0; }
-
-  void push_back(double t)
-  {
-    records.push_back(t);
-    overall_time += t;
-  }
-};
-
 /// @brief Generate environment with 3 * n objects for self distance, so we try to make sure none of them collide with each other.
 template <typename Scalar>
 void generateSelfDistanceEnvironments(std::vector<CollisionObject<Scalar>*>& env, Scalar env_scale, std::size_t n);