Skip to content

Commit

Permalink
refactor(cluster_merger): add package name prefix of autoware_ (#8001)
Browse files Browse the repository at this point in the history
Signed-off-by: badai-nguyen <[email protected]>
  • Loading branch information
badai-nguyen authored Jul 16, 2024
1 parent 6bca8e8 commit a6c709e
Show file tree
Hide file tree
Showing 10 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ perception/autoware_radar_fusion_to_detected_object/** [email protected] s
perception/autoware_radar_object_clustering/** [email protected] [email protected] [email protected] [email protected]
perception/autoware_radar_object_tracker/** [email protected] [email protected] [email protected]
perception/bytetrack/** [email protected] [email protected]
perception/cluster_merger/** [email protected] [email protected] [email protected]
perception/autoware_cluster_merger/** [email protected] [email protected] [email protected]
perception/compare_map_segmentation/** [email protected] [email protected] [email protected]
perception/detected_object_feature_remover/** [email protected]
perception/detected_object_validation/** [email protected] [email protected] [email protected] [email protected] [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@

<!-- simple_cluster_merger -->
<group>
<include file="$(find-pkg-share cluster_merger)/launch/cluster_merger.launch.xml" if="$(var use_roi_based_cluster)">
<include file="$(find-pkg-share autoware_cluster_merger)/launch/cluster_merger.launch.xml" if="$(var use_roi_based_cluster)">
<arg name="input/cluster0" value="euclidean_cluster/clusters"/>
<arg name="input/cluster1" value="roi_cluster/clusters"/>
<arg name="output/clusters" value="clusters"/>
Expand Down
2 changes: 1 addition & 1 deletion launch/tier4_perception_launch/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<buildtool_depend>ament_cmake_auto</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>

<exec_depend>autoware_cluster_merger</exec_depend>
<exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
<exec_depend>autoware_object_range_splitter</exec_depend>
Expand All @@ -21,7 +22,6 @@
<exec_depend>autoware_radar_fusion_to_detected_object</exec_depend>
<exec_depend>autoware_radar_object_clustering</exec_depend>
<exec_depend>autoware_radar_object_tracker</exec_depend>
<exec_depend>cluster_merger</exec_depend>
<exec_depend>compare_map_segmentation</exec_depend>
<exec_depend>detected_object_feature_remover</exec_depend>
<exec_depend>detected_object_validation</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.8)
project(cluster_merger)
project(autoware_cluster_merger)

# find dependencies
find_package(autoware_cmake REQUIRED)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# cluster merger
# autoware cluster merger

## Purpose

cluster_merger is a package for merging pointcloud clusters as detected objects with feature type.
autoware_cluster_merger is a package for merging pointcloud clusters as detected objects with feature type.

## Inner-working / Algorithms

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<arg name="output/clusters" default="output/clusters"/>
<arg name="input/cluster0" default="input/cluster0"/>
<arg name="input/cluster1" default="input/cluster1"/>
<arg name="param_path" default="$(find-pkg-share cluster_merger)/config/cluster_merger.param.yaml"/>
<arg name="param_path" default="$(find-pkg-share autoware_cluster_merger)/config/cluster_merger.param.yaml"/>
<!-- Node -->
<node pkg="cluster_merger" exec="cluster_merger_node" name="cluster_merger" output="screen">
<node pkg="autoware_cluster_merger" exec="cluster_merger_node" name="autoware_cluster_merger" output="screen">
<remap from="~/output/clusters" to="$(var output/clusters)"/>
<remap from="input/cluster0" to="$(var input/cluster0)"/>
<remap from="input/cluster1" to="$(var input/cluster1)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?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>cluster_merger</name>
<name>autoware_cluster_merger</name>
<version>0.1.0</version>
<description>The ROS 2 cluster merger package</description>
<maintainer email="[email protected]">Yukihiro Saito</maintainer>
Expand Down

0 comments on commit a6c709e

Please sign in to comment.