Skip to content

Commit 287e753

Browse files
YoshiRipre-commit-ci[bot]technolojin
authored
refactor(probabilistic_occupancy_grid_map, occupancy_grid_map_outlier_filter): add autoware_ prefix to package name (#8183)
* chore: fix package name probabilistic occupancy grid map Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com> * fix: solve launch error Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com> * chore: update occupancy_grid_map_outlier_filter Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com> * style(pre-commit): autofix * refactor: update package name to autoware_probabilistic_occupancy_grid_map on a test Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> * refactor: rename folder of occupancy_grid_map_outlier_filter Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> --------- Signed-off-by: yoshiri <yoshiyoshidetteiu@gmail.com> Signed-off-by: Taekjin LEE <taekjin.lee@tier4.jp> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Taekjin LEE <taekjin.lee@tier4.jp>
1 parent fc338c5 commit 287e753

File tree

76 files changed

+48
-48
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+48
-48
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ perception/autoware_ground_segmentation/** abrahammonrroy@yahoo.com dai.nguyen@t
128128
perception/autoware_image_projection_based_fusion/** dai.nguyen@tier4.jp koji.minoda@tier4.jp kotaro.uetake@tier4.jp shunsuke.miura@tier4.jp tao.zhong@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
129129
perception/autoware_lidar_apollo_instance_segmentation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
130130
perception/autoware_lidar_centerpoint/** kenzo.lobos@tier4.jp koji.minoda@tier4.jp
131-
perception/occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
132-
perception/probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
131+
perception/autoware_occupancy_grid_map_outlier_filter/** abrahammonrroy@yahoo.com yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
133132
perception/autoware_radar_tracks_msgs_converter/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp taekjin.lee@tier4.jp yoshi.ri@tier4.jp
133+
perception/autoware_probabilistic_occupancy_grid_map/** mamoru.sobue@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
134134
perception/autoware_raindrop_cluster_filter/** dai.nguyen@tier4.jp yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
135135
perception/autoware_shape_estimation/** yoshi.ri@tier4.jp yukihiro.saito@tier4.jp
136136
perception/autoware_simple_object_merger/** satoshi.tanaka@tier4.jp shunsuke.miura@tier4.jp yoshi.ri@tier4.jp

launch/tier4_perception_launch/launch/obstacle_segmentation/ground_segmentation/ground_segmentation.launch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ def create_time_series_outlier_filter_components(input_topic, output_topic):
331331
components = []
332332
components.append(
333333
ComposableNode(
334-
package="occupancy_grid_map_outlier_filter",
334+
package="autoware_occupancy_grid_map_outlier_filter",
335335
plugin="autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent",
336336
name="occupancy_grid_based_outlier_filter",
337337
remappings=[

launch/tier4_perception_launch/launch/occupancy_grid_map/probabilistic_occupancy_grid_map.launch.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
<!--pointcloud based method-->
1818
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='pointcloud_based_occupancy_grid_map'&quot;)">
19-
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/pointcloud_based_occupancy_grid_map.launch.py">
19+
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/pointcloud_based_occupancy_grid_map.launch.py">
2020
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
2121
<arg name="input/raw_pointcloud" value="$(var input/raw_pointcloud)"/>
2222
<arg name="output" value="$(var output)"/>
@@ -32,7 +32,7 @@
3232

3333
<!--laserscan based method-->
3434
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='laserscan_based_occupancy_grid_map'&quot;)">
35-
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/laserscan_based_occupancy_grid_map.launch.py">
35+
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/laserscan_based_occupancy_grid_map.launch.py">
3636
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
3737
<arg name="input/raw_pointcloud" value="$(var input/raw_pointcloud)"/>
3838
<arg name="output" value="$(var output)"/>
@@ -50,7 +50,7 @@
5050

5151
<!--multi lidar pointclouds based method-->
5252
<group if="$(eval &quot;'$(var occupancy_grid_map_method)'=='multi_lidar_pointcloud_based_occupancy_grid_map'&quot;)">
53-
<include file="$(find-pkg-share probabilistic_occupancy_grid_map)/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py">
53+
<include file="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py">
5454
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
5555
<arg name="output" value="/perception/occupancy_grid_map/map"/>
5656
<arg name="use_intra_process" value="true"/>

launch/tier4_perception_launch/package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@
2929
<exec_depend>autoware_object_merger</exec_depend>
3030
<exec_depend>autoware_object_range_splitter</exec_depend>
3131
<exec_depend>autoware_object_velocity_splitter</exec_depend>
32+
<exec_depend>autoware_occupancy_grid_map_outlier_filter</exec_depend>
3233
<exec_depend>autoware_pointcloud_preprocessor</exec_depend>
34+
<exec_depend>autoware_probabilistic_occupancy_grid_map</exec_depend>
3335
<exec_depend>autoware_radar_crossing_objects_noise_filter</exec_depend>
3436
<exec_depend>autoware_radar_fusion_to_detected_object</exec_depend>
3537
<exec_depend>autoware_radar_object_clustering</exec_depend>
@@ -38,9 +40,7 @@
3840
<exec_depend>autoware_shape_estimation</exec_depend>
3941
<exec_depend>autoware_tracking_object_merger</exec_depend>
4042
<exec_depend>image_transport_decompressor</exec_depend>
41-
<exec_depend>occupancy_grid_map_outlier_filter</exec_depend>
4243
<exec_depend>pointcloud_to_laserscan</exec_depend>
43-
<exec_depend>probabilistic_occupancy_grid_map</exec_depend>
4444
<exec_depend>topic_tools</exec_depend>
4545
<exec_depend>traffic_light_arbiter</exec_depend>
4646

perception/autoware_detected_object_validation/launch/occupancy_grid_based_validator.launch.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55

66
<arg name="input/laserscan" default="/perception/occupancy_grid_map/virtual_scan/laserscan"/>
77
<arg name="input/occupancy_grid_map" default="/perception/object_recognition/detection/validation/occupancy_grid_based/single_frame_occupancy_grid_map"/>
8-
<arg name="occupancy_grid_map_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/laserscan_based_occupancy_grid_map.param.yaml"/>
9-
<arg name="occupancy_grid_map_updater_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/binary_bayes_filter_updater.param.yaml"/>
8+
<arg name="occupancy_grid_map_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/laserscan_based_occupancy_grid_map.param.yaml"/>
9+
<arg name="occupancy_grid_map_updater_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/binary_bayes_filter_updater.param.yaml"/>
1010
<arg name="occupancy_grid_based_validator_param_path" default="$(find-pkg-share autoware_detected_object_validation)/config/occupancy_grid_based_validator_param_path.param.yaml"/>
1111

12-
<node pkg="probabilistic_occupancy_grid_map" exec="laserscan_based_occupancy_grid_map_node" name="single_frame_laserscan_occupancy_grid_map" output="screen">
12+
<node pkg="autoware_probabilistic_occupancy_grid_map" exec="laserscan_based_occupancy_grid_map_node" name="single_frame_laserscan_occupancy_grid_map" output="screen">
1313
<remap from="~/input/laserscan" to="$(var input/laserscan)"/>
1414
<remap from="~/output/occupancy_grid_map" to="$(var input/occupancy_grid_map)"/>
1515
<param name="input_obstacle_pointcloud" value="false"/>

perception/occupancy_grid_map_outlier_filter/CMakeLists.txt renamed to perception/autoware_occupancy_grid_map_outlier_filter/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(occupancy_grid_map_outlier_filter)
2+
project(autoware_occupancy_grid_map_outlier_filter)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()
@@ -41,6 +41,6 @@ endif()
4141
# -- Occupancy Grid Map Outlier Filter --
4242
rclcpp_components_register_node(${PROJECT_NAME}
4343
PLUGIN "autoware::occupancy_grid_map_outlier_filter::OccupancyGridMapOutlierFilterComponent"
44-
EXECUTABLE occupancy_grid_map_outlier_filter_node)
44+
EXECUTABLE ${PROJECT_NAME}_node)
4545

4646
ament_auto_package(INSTALL_TO_SHARE)

perception/occupancy_grid_map_outlier_filter/README.md renamed to perception/autoware_occupancy_grid_map_outlier_filter/README.md

Lines changed: 1 addition & 1 deletion

perception/occupancy_grid_map_outlier_filter/package.xml renamed to perception/autoware_occupancy_grid_map_outlier_filter/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>occupancy_grid_map_outlier_filter</name>
4+
<name>autoware_occupancy_grid_map_outlier_filter</name>
55
<version>0.1.0</version>
66
<description>The ROS 2 occupancy_grid_map_outlier_filter package</description>
77
<maintainer email="abrahammonrroy@yahoo.com">amc-nu</maintainer>

perception/probabilistic_occupancy_grid_map/CMakeLists.txt renamed to perception/autoware_probabilistic_occupancy_grid_map/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.14)
2-
project(probabilistic_occupancy_grid_map)
2+
project(autoware_probabilistic_occupancy_grid_map)
33

44
find_package(autoware_cmake REQUIRED)
55
autoware_package()

perception/probabilistic_occupancy_grid_map/README.md renamed to perception/autoware_probabilistic_occupancy_grid_map/README.md

Lines changed: 8 additions & 8 deletions

perception/probabilistic_occupancy_grid_map/launch/debug.launch.xml renamed to perception/autoware_probabilistic_occupancy_grid_map/launch/debug.launch.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<group>
44
<push-ros-namespace namespace="/perception/occupancy_grid_map/"/>
55
<node name="grid_map_visualization" pkg="grid_map_visualization" exec="grid_map_visualization">
6-
<param from="$(find-pkg-share probabilistic_occupancy_grid_map)/config/grid_map_param.yaml"/>
6+
<param from="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/grid_map_param.yaml"/>
77
</node>
88
</group>
99
</launch>

perception/probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py renamed to perception/autoware_probabilistic_occupancy_grid_map/launch/laserscan_based_occupancy_grid_map.launch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def launch_setup(context, *args, **kwargs):
8484
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
8585
),
8686
ComposableNode(
87-
package="probabilistic_occupancy_grid_map",
87+
package="autoware_probabilistic_occupancy_grid_map",
8888
plugin="autoware::occupancy_grid_map::LaserscanBasedOccupancyGridMapNode",
8989
name="occupancy_grid_map_node",
9090
remappings=[
@@ -162,13 +162,13 @@ def add_launch_arg(name: str, default_value=None):
162162
add_launch_arg("output/stixel", "virtual_scan/stixel"),
163163
add_launch_arg(
164164
"param_file",
165-
get_package_share_directory("probabilistic_occupancy_grid_map")
165+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
166166
+ "/config/laserscan_based_occupancy_grid_map.param.yaml",
167167
),
168168
add_launch_arg("updater_type", "binary_bayes_filter"),
169169
add_launch_arg(
170170
"updater_param_file",
171-
get_package_share_directory("probabilistic_occupancy_grid_map")
171+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
172172
+ "/config/updater.param.yaml",
173173
),
174174
add_launch_arg("input_obstacle_pointcloud", "false"),

perception/probabilistic_occupancy_grid_map/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py renamed to perception/autoware_probabilistic_occupancy_grid_map/launch/multi_lidar_pointcloud_based_occupancy_grid_map.launch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def launch_setup(context, *args, **kwargs):
195195

196196
# generate composable node
197197
node = ComposableNode(
198-
package="probabilistic_occupancy_grid_map",
198+
package="autoware_probabilistic_occupancy_grid_map",
199199
plugin="autoware::occupancy_grid_map::PointcloudBasedOccupancyGridMapNode",
200200
name="occupancy_grid_map_node",
201201
namespace=frame_name,
@@ -218,7 +218,7 @@ def launch_setup(context, *args, **kwargs):
218218
# 2. launch occupancy grid map fusion node
219219
gridmap_fusion_node = [
220220
ComposableNode(
221-
package="probabilistic_occupancy_grid_map",
221+
package="autoware_probabilistic_occupancy_grid_map",
222222
plugin="synchronized_grid_map_fusion::GridMapFusionNode",
223223
name="occupancy_grid_map_fusion_node",
224224
remappings=[
@@ -275,13 +275,13 @@ def add_launch_arg(name: str, default_value=None):
275275
add_launch_arg("output", "occupancy_grid"),
276276
add_launch_arg(
277277
"multi_lidar_fusion_config_file",
278-
get_package_share_directory("probabilistic_occupancy_grid_map")
278+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
279279
+ "/config/multi_lidar_pointcloud_based_occupancy_grid_map.param.yaml",
280280
),
281281
add_launch_arg("updater_type", "binary_bayes_filter"),
282282
add_launch_arg(
283283
"updater_param_file",
284-
get_package_share_directory("probabilistic_occupancy_grid_map")
284+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
285285
+ "/config/binary_bayes_filter_updater.param.yaml",
286286
),
287287
set_container_executable,

perception/probabilistic_occupancy_grid_map/launch/pointcloud_based_occupancy_grid_map.launch.py renamed to perception/autoware_probabilistic_occupancy_grid_map/launch/pointcloud_based_occupancy_grid_map.launch.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def launch_setup(context, *args, **kwargs):
9595

9696
composable_nodes.append(
9797
ComposableNode(
98-
package="probabilistic_occupancy_grid_map",
98+
package="autoware_probabilistic_occupancy_grid_map",
9999
plugin="autoware::occupancy_grid_map::PointcloudBasedOccupancyGridMapNode",
100100
name="occupancy_grid_map_node",
101101
remappings=[
@@ -173,13 +173,13 @@ def add_launch_arg(name: str, default_value=None):
173173
add_launch_arg("output", "occupancy_grid"),
174174
add_launch_arg(
175175
"param_file",
176-
get_package_share_directory("probabilistic_occupancy_grid_map")
176+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
177177
+ "/config/pointcloud_based_occupancy_grid_map.param.yaml",
178178
),
179179
add_launch_arg("updater_type", "binary_bayes_filter"),
180180
add_launch_arg(
181181
"updater_param_file",
182-
get_package_share_directory("probabilistic_occupancy_grid_map")
182+
get_package_share_directory("autoware_probabilistic_occupancy_grid_map")
183183
+ "/config/binary_bayes_filter_updater.param.yaml",
184184
),
185185
set_container_executable,

perception/probabilistic_occupancy_grid_map/launch/synchronized_occupancy_grid_map_fusion.launch.xml renamed to perception/autoware_probabilistic_occupancy_grid_map/launch/synchronized_occupancy_grid_map_fusion.launch.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0"?>
22
<launch>
33
<arg name="output_topic" default="~/output/occupancy_grid_map"/>
4-
<arg name="fusion_node_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>
4+
<arg name="fusion_node_param_path" default="$(find-pkg-share autoware_probabilistic_occupancy_grid_map)/config/synchronized_grid_map_fusion_node.param.yaml"/>
55

6-
<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="probabilistic_occupancy_grid_map" output="screen">
6+
<node name="synchronized_grid_map_fusion_node" exec="synchronized_grid_map_fusion_node" pkg="autoware_probabilistic_occupancy_grid_map" output="screen">
77
<remap from="~/output/occupancy_grid_map" to="$(var output_topic)"/>
88
<param from="$(var fusion_node_param_path)"/>
99
</node>

perception/probabilistic_occupancy_grid_map/package.xml renamed to perception/autoware_probabilistic_occupancy_grid_map/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
4-
<name>probabilistic_occupancy_grid_map</name>
4+
<name>autoware_probabilistic_occupancy_grid_map</name>
55
<version>0.1.0</version>
66
<description>generate probabilistic occupancy grid map</description>
77
<maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>

perception/probabilistic_occupancy_grid_map/pointcloud-based-occupancy-grid-map.md renamed to perception/autoware_probabilistic_occupancy_grid_map/pointcloud-based-occupancy-grid-map.md

Lines changed: 1 addition & 1 deletion

perception/probabilistic_occupancy_grid_map/synchronized_grid_map_fusion.md renamed to perception/autoware_probabilistic_occupancy_grid_map/synchronized_grid_map_fusion.md

Lines changed: 6 additions & 6 deletions

0 commit comments

Comments
 (0)