refactor(autoware_object_merger): move headers to src and rename package

Signed-off-by: Esteve Fernandez <[email protected]>
autowarefoundation · Jul 16, 2024 · 948b30f · 948b30f
1 parent 6bca8e8
commit 948b30f
Show file tree

Hide file tree

Showing 22 changed files with 36 additions and 36 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -106,6 +106,7 @@ map/map_tf_generator/** [email protected] [email protected] masahiro
 map/util/lanelet2_map_preprocessor/** [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
 perception/autoware_crosswalk_traffic_light_estimator/** [email protected] [email protected] [email protected]
 perception/autoware_map_based_prediction/** [email protected] [email protected] [email protected] [email protected] [email protected]
+perception/autoware_object_merger/** [email protected] [email protected] [email protected]
 perception/autoware_object_range_splitter/** [email protected] [email protected]
 perception/autoware_object_velocity_splitter/** [email protected] [email protected] [email protected]
 perception/autoware_radar_crossing_objects_noise_filter/** [email protected] [email protected] [email protected] [email protected]
@@ -128,7 +129,6 @@ perception/lidar_apollo_segmentation_tvm_nodes/** [email protected] yoshi
 perception/lidar_centerpoint/** [email protected] [email protected]
 perception/lidar_transfusion/** [email protected] [email protected] [email protected]
 perception/multi_object_tracker/** [email protected] [email protected] [email protected]
-perception/object_merger/** [email protected] [email protected] [email protected]
 perception/occupancy_grid_map_outlier_filter/** [email protected] [email protected] [email protected]
 perception/probabilistic_occupancy_grid_map/** [email protected] [email protected] [email protected]
 perception/radar_tracks_msgs_converter/** [email protected] [email protected] [email protected] [email protected]

diff --git a/launch/tier4_perception_launch/package.xml b/launch/tier4_perception_launch/package.xml
@@ -15,6 +15,7 @@
 
   <exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
   <exec_depend>autoware_map_based_prediction</exec_depend>
+  <exec_depend>autoware_object_merger</exec_depend>
   <exec_depend>autoware_object_range_splitter</exec_depend>
   <exec_depend>autoware_object_velocity_splitter</exec_depend>
   <exec_depend>autoware_radar_crossing_objects_noise_filter</exec_depend>
@@ -33,7 +34,6 @@
   <exec_depend>image_transport_decompressor</exec_depend>
   <exec_depend>lidar_apollo_instance_segmentation</exec_depend>
   <exec_depend>multi_object_tracker</exec_depend>
-  <exec_depend>object_merger</exec_depend>
   <exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
   <exec_depend>pointcloud_preprocessor</exec_depend>
   <exec_depend>pointcloud_to_laserscan</exec_depend>

diff --git a/perception/object_merger/CMakeLists.txt → ...ion/autoware_object_merger/CMakeLists.txt b/perception/object_merger/CMakeLists.txt → ...ion/autoware_object_merger/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.14)
-project(object_merger)
+project(autoware_object_merger)
 
 find_package(autoware_cmake REQUIRED)
 autoware_package()

diff --git a/perception/object_merger/README.md → perception/autoware_object_merger/README.md b/perception/object_merger/README.md → perception/autoware_object_merger/README.md
diff --git a/...config/data_association_matrix.param.yaml → ...config/data_association_matrix.param.yaml b/...config/data_association_matrix.param.yaml → ...config/data_association_matrix.param.yaml
diff --git a/...nfig/object_association_merger.param.yaml → ...nfig/object_association_merger.param.yaml b/...nfig/object_association_merger.param.yaml → ...nfig/object_association_merger.param.yaml
diff --git a/...merger/config/overlapped_judge.param.yaml → ...merger/config/overlapped_judge.param.yaml b/...merger/config/overlapped_judge.param.yaml → ...merger/config/overlapped_judge.param.yaml
diff --git a/...t_merger/association/data_association.hpp → ...t_merger/association/data_association.hpp b/...t_merger/association/data_association.hpp → ...t_merger/association/data_association.hpp
@@ -16,12 +16,12 @@
 // Author: v1.0 Yukihiro Saito
 //
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
+#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
 
 #define EIGEN_MPL2_ONLY
 
-#include "autoware_object_merger/association/solver/gnn_solver.hpp"
+#include "autoware/object_merger/association/solver/gnn_solver.hpp"
 
 #include <Eigen/Core>
 #include <Eigen/Geometry>
@@ -62,4 +62,4 @@ class DataAssociation
 
 }  // namespace autoware::object_merger
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__ASSOCIATION__DATA_ASSOCIATION_HPP_
diff --git a/..._merger/association/solver/gnn_solver.hpp → ..._merger/association/solver/gnn_solver.hpp b/..._merger/association/solver/gnn_solver.hpp → ..._merger/association/solver/gnn_solver.hpp
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
 
-#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
-#include "autoware_object_merger/association/solver/mu_ssp.hpp"
-#include "autoware_object_merger/association/solver/ssp.hpp"
+#include "autoware/object_merger/association/solver/gnn_solver_interface.hpp"
+#include "autoware/object_merger/association/solver/mu_ssp.hpp"
+#include "autoware/object_merger/association/solver/ssp.hpp"
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_HPP_
diff --git a/...sociation/solver/gnn_solver_interface.hpp → ...sociation/solver/gnn_solver_interface.hpp b/...sociation/solver/gnn_solver_interface.hpp → ...sociation/solver/gnn_solver_interface.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
 
 #include <unordered_map>
 #include <vector>
@@ -32,4 +32,4 @@ class GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__GNN_SOLVER_INTERFACE_HPP_
diff --git a/...ject_merger/association/solver/mu_ssp.hpp → ...ject_merger/association/solver/mu_ssp.hpp b/...ject_merger/association/solver/mu_ssp.hpp → ...ject_merger/association/solver/mu_ssp.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
+#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
 
-#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
+#include "autoware/object_merger/association/solver/gnn_solver_interface.hpp"
 
 #include <unordered_map>
 #include <vector>
@@ -34,4 +34,4 @@ class MuSSP : public GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__MU_SSP_HPP_
diff --git a/..._object_merger/association/solver/ssp.hpp → .../object_merger/association/solver/ssp.hpp b/..._object_merger/association/solver/ssp.hpp → .../object_merger/association/solver/ssp.hpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
-#define AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
+#define AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
 
-#include "autoware_object_merger/association/solver/gnn_solver_interface.hpp"
+#include "autoware/object_merger/association/solver/gnn_solver_interface.hpp"
 
 #include <unordered_map>
 #include <vector>
@@ -34,4 +34,4 @@ class SSP : public GnnSolverInterface
 };
 }  // namespace autoware::object_merger::gnn_solver
 
-#endif  // AUTOWARE_OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__ASSOCIATION__SOLVER__SSP_HPP_
diff --git a/...er/src/object_association_merger_node.hpp → ...merger/object_association_merger_node.hpp b/...er/src/object_association_merger_node.hpp → ...merger/object_association_merger_node.hpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef OBJECT_ASSOCIATION_MERGER_NODE_HPP_
-#define OBJECT_ASSOCIATION_MERGER_NODE_HPP_
+#ifndef AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_
+#define AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_
 
+#include "autoware/object_merger/association/data_association.hpp"
 #include "autoware/universe_utils/ros/debug_publisher.hpp"
 #include "autoware/universe_utils/ros/published_time_publisher.hpp"
 #include "autoware/universe_utils/system/stop_watch.hpp"
-#include "autoware_object_merger/association/data_association.hpp"
 
 #include <rclcpp/rclcpp.hpp>
 
@@ -91,4 +91,4 @@ class ObjectAssociationMergerNode : public rclcpp::Node
 };
 }  // namespace autoware::object_merger
 
-#endif  // OBJECT_ASSOCIATION_MERGER_NODE_HPP_
+#endif  // AUTOWARE__OBJECT_MERGER__OBJECT_ASSOCIATION_MERGER_NODE_HPP_
diff --git a/...unch/object_association_merger.launch.xml → ...unch/object_association_merger.launch.xml b/...unch/object_association_merger.launch.xml → ...unch/object_association_merger.launch.xml
@@ -8,7 +8,7 @@
   <arg name="distance_threshold_list_path" default="$(find-pkg-share object_merger)/config/overlapped_judge.param.yaml"/>
   <arg name="object_association_merger_param_path" default="$(find-pkg-share object_merger)/config/object_association_merger.param.yaml"/>
 
-  <node pkg="object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
+  <node pkg="autoware_object_merger" exec="object_association_merger_node" name="$(anon object_association_merger)" output="screen">
     <remap from="input/object0" to="$(var input/object0)"/>
     <remap from="input/object1" to="$(var input/object1)"/>
     <remap from="output/object" to="$(var output/object)"/>

diff --git a/perception/object_merger/package.xml → ...eption/autoware_object_merger/package.xml b/perception/object_merger/package.xml → ...eption/autoware_object_merger/package.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>object_merger</name>
+  <name>autoware_object_merger</name>
   <version>0.1.0</version>
-  <description>The object_merger package</description>
+  <description>The autoware_object_merger package</description>
   <maintainer email="[email protected]">Yukihiro Saito</maintainer>
   <maintainer email="[email protected]">Yoshi Ri</maintainer>
   <maintainer email="[email protected]">Taekjin Lee</maintainer>

diff --git a/...chema/data_association_matrix.schema.json → ...chema/data_association_matrix.schema.json b/...chema/data_association_matrix.schema.json → ...chema/data_association_matrix.schema.json
diff --git a/...ema/object_association_merger.schema.json → ...ema/object_association_merger.schema.json b/...ema/object_association_merger.schema.json → ...ema/object_association_merger.schema.json
diff --git a/...erger/schema/overlapped_judge.schema.json → ...erger/schema/overlapped_judge.schema.json b/...erger/schema/overlapped_judge.schema.json → ...erger/schema/overlapped_judge.schema.json
diff --git a/...rger/src/association/data_association.cpp → ...rger/src/association/data_association.cpp b/...rger/src/association/data_association.cpp → ...rger/src/association/data_association.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "autoware_object_merger/association/data_association.hpp"
+#include "autoware/object_merger/association/data_association.hpp"
 
+#include "autoware/object_merger/association/solver/gnn_solver.hpp"
 #include "autoware/universe_utils/geometry/geometry.hpp"
-#include "autoware_object_merger/association/solver/gnn_solver.hpp"
 #include "object_recognition_utils/object_recognition_utils.hpp"
 
 #include <algorithm>

diff --git a/...r/mu_successive_shortest_path_wrapper.cpp → ...r/mu_successive_shortest_path_wrapper.cpp b/...r/mu_successive_shortest_path_wrapper.cpp → ...r/mu_successive_shortest_path_wrapper.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "autoware_object_merger/association/solver/mu_ssp.hpp"
+#include "autoware/object_merger/association/solver/mu_ssp.hpp"
 
 #include <mussp/mussp.h>
 

diff --git a/...ation/solver/successive_shortest_path.cpp → ...ation/solver/successive_shortest_path.cpp b/...ation/solver/successive_shortest_path.cpp → ...ation/solver/successive_shortest_path.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "autoware_object_merger/association/solver/ssp.hpp"
+#include "autoware/object_merger/association/solver/ssp.hpp"
 
 #include <algorithm>
 #include <cassert>

diff --git a/...er/src/object_association_merger_node.cpp → ...er/src/object_association_merger_node.cpp b/...er/src/object_association_merger_node.cpp → ...er/src/object_association_merger_node.cpp
@@ -14,7 +14,7 @@
 
 #define EIGEN_MPL2_ONLY
 
-#include "object_association_merger_node.hpp"
+#include "autoware/object_merger/object_association_merger_node.hpp"
 
 #include "autoware/universe_utils/geometry/geometry.hpp"
 #include "object_recognition_utils/object_recognition_utils.hpp"