Skip to content

Commit

Permalink
refactor(detected_object_validation)!: add package name prefix of aut…
Browse files Browse the repository at this point in the history
…oware_ (autowarefoundation#8122)

refactor: rename detected_object_validation to autoware_detected_object_validation

Signed-off-by: Taekjin LEE <[email protected]>
  • Loading branch information
technolojin authored and esteve committed Aug 13, 2024
1 parent aba5baa commit af24b26
Show file tree
Hide file tree
Showing 36 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ perception/bytetrack/** [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/autoware_detected_object_feature_remover/** [email protected]
perception/detected_object_validation/** [email protected] [email protected] [email protected] [email protected] [email protected]
perception/autoware_detected_object_validation/** [email protected] [email protected] [email protected] [email protected] [email protected]
perception/autoware_detection_by_tracker/** [email protected] [email protected] [email protected]
perception/elevation_map_loader/** [email protected] [email protected] [email protected]
perception/autoware_euclidean_cluster/** [email protected] [email protected]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@

<!-- Filter -->
<group if="$(eval &quot;'$(var objects_filter_method)'=='lanelet_filter'&quot;)">
<include file="$(find-pkg-share detected_object_validation)/launch/object_lanelet_filter.launch.xml">
<include file="$(find-pkg-share autoware_detected_object_validation)/launch/object_lanelet_filter.launch.xml">
<arg name="input/object" value="$(var input/objects)"/>
<arg name="output/object" value="$(var output/objects)"/>
<arg name="filtering_range_param" value="$(var object_recognition_detection_object_lanelet_filter_param_path)"/>
</include>
</group>
<group if="$(eval &quot;'$(var objects_filter_method)'=='position_filter'&quot;)">
<include file="$(find-pkg-share detected_object_validation)/launch/object_position_filter.launch.xml">
<include file="$(find-pkg-share autoware_detected_object_validation)/launch/object_position_filter.launch.xml">
<arg name="input/object" value="$(var input/objects)"/>
<arg name="output/object" value="$(var output/objects)"/>
<arg name="filtering_range_param" value="$(var object_recognition_detection_object_position_filter_param_path)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@

<!-- Validator -->
<group if="$(eval &quot;'$(var objects_validation_method)'=='obstacle_pointcloud'&quot;)">
<include file="$(find-pkg-share detected_object_validation)/launch/obstacle_pointcloud_based_validator.launch.xml">
<include file="$(find-pkg-share autoware_detected_object_validation)/launch/obstacle_pointcloud_based_validator.launch.xml">
<arg name="input/detected_objects" value="$(var input/objects)"/>
<arg name="input/obstacle_pointcloud" value="$(var input/obstacle_pointcloud)"/>
<arg name="output/objects" value="$(var output/objects)"/>
<arg name="obstacle_pointcloud_based_validator_param_path" value="$(var object_recognition_detection_obstacle_pointcloud_based_validator_param_path)"/>
</include>
</group>
<group if="$(eval &quot;'$(var objects_validation_method)'=='occupancy_grid'&quot;)">
<include file="$(find-pkg-share detected_object_validation)/launch/occupancy_grid_based_validator.launch.xml">
<include file="$(find-pkg-share autoware_detected_object_validation)/launch/occupancy_grid_based_validator.launch.xml">
<arg name="input/detected_objects" value="$(var input/objects)"/>
<arg name="output/objects" value="$(var output/objects)"/>
</include>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<arg name="radar_crossing_objects_noise_filter_param_path"/>
<arg name="object_velocity_splitter_param_path" default="$(var object_recognition_detection_object_velocity_splitter_radar_param_path)"/>
<arg name="object_range_splitter_param_path" default="$(var object_recognition_detection_object_range_splitter_radar_param_path)"/>
<arg name="radar_lanelet_filtering_range_param_path" default="$(find-pkg-share detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
<arg name="radar_lanelet_filtering_range_param_path" default="$(find-pkg-share autoware_detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
<arg name="radar_object_clustering_param_path" default="$(find-pkg-share autoware_radar_object_clustering)/config/radar_object_clustering.param.yaml"/>

<!-- External interfaces -->
Expand Down Expand Up @@ -33,7 +33,7 @@
<arg name="param_path" value="$(var object_range_splitter_param_path)"/>
</include>

<include file="$(find-pkg-share detected_object_validation)/launch/object_lanelet_filter.launch.xml">
<include file="$(find-pkg-share autoware_detected_object_validation)/launch/object_lanelet_filter.launch.xml">
<arg name="input/object" value="far_high_speed_objects"/>
<arg name="output/object" value="lanelet_filtered_objects"/>
<arg name="filtering_range_param" value="$(var radar_lanelet_filtering_range_param_path)"/>
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 @@ -16,6 +16,7 @@
<exec_depend>autoware_cluster_merger</exec_depend>
<exec_depend>autoware_crosswalk_traffic_light_estimator</exec_depend>
<exec_depend>autoware_detected_object_feature_remover</exec_depend>
<exec_depend>autoware_detected_object_validation</exec_depend>
<exec_depend>autoware_detection_by_tracker</exec_depend>
<exec_depend>autoware_euclidean_cluster</exec_depend>
<exec_depend>autoware_map_based_prediction</exec_depend>
Expand All @@ -31,7 +32,6 @@
<exec_depend>autoware_raindrop_cluster_filter</exec_depend>
<exec_depend>autoware_tracking_object_merger</exec_depend>
<exec_depend>compare_map_segmentation</exec_depend>
<exec_depend>detected_object_validation</exec_depend>
<exec_depend>elevation_map_loader</exec_depend>
<exec_depend>ground_segmentation</exec_depend>
<exec_depend>image_projection_based_fusion</exec_depend>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.14)
project(detected_object_validation)
project(autoware_detected_object_validation)

find_package(autoware_cmake REQUIRED)
autoware_package()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<arg name="vector_map_topic" default="/map/vector_map"/>
<arg name="input/object" default="in_objects"/>
<arg name="output/object" default="out_objects"/>
<arg name="filtering_range_param" default="$(find-pkg-share detected_object_validation)/config/object_lanelet_filter.param.yaml"/>
<arg name="filtering_range_param" default="$(find-pkg-share autoware_detected_object_validation)/config/object_lanelet_filter.param.yaml"/>

<node pkg="detected_object_validation" exec="object_lanelet_filter_node" name="object_lanelet_filter" output="screen">
<node pkg="autoware_detected_object_validation" exec="object_lanelet_filter_node" name="object_lanelet_filter" output="screen">
<remap from="input/vector_map" to="$(var vector_map_topic)"/>
<remap from="input/object" to="$(var input/object)"/>
<remap from="output/object" to="$(var output/object)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<launch>
<arg name="input/object" default="in_objects"/>
<arg name="output/object" default="out_objects"/>
<arg name="filtering_range_param" default="$(find-pkg-share detected_object_validation)/config/object_position_filter.param.yaml"/>
<arg name="filtering_range_param" default="$(find-pkg-share autoware_detected_object_validation)/config/object_position_filter.param.yaml"/>

<node pkg="detected_object_validation" exec="object_position_filter_node" name="object_position_filter" output="screen">
<node pkg="autoware_detected_object_validation" exec="object_position_filter_node" name="object_position_filter" output="screen">
<remap from="input/object" to="$(var input/object)"/>
<remap from="output/object" to="$(var output/object)"/>
<param from="$(var filtering_range_param)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<arg name="input/detected_objects" default="/perception/object_recognition/detection/objects"/>
<arg name="input/obstacle_pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
<arg name="output/objects" default="/perception/object_recognition/detection/validation/obstacle_pointcloud_based/objects"/>
<arg name="obstacle_pointcloud_based_validator_param_path" default="$(find-pkg-share detected_object_validation)/config/obstacle_pointcloud_based_validator.param.yaml"/>
<arg name="obstacle_pointcloud_based_validator_param_path" default="$(find-pkg-share autoware_detected_object_validation)/config/obstacle_pointcloud_based_validator.param.yaml"/>

<node pkg="detected_object_validation" exec="obstacle_pointcloud_based_validator_node" name="obstacle_pointcloud_based_validator_node" output="screen">
<node pkg="autoware_detected_object_validation" exec="obstacle_pointcloud_based_validator_node" name="obstacle_pointcloud_based_validator_node" output="screen">
<remap from="~/input/detected_objects" to="$(var input/detected_objects)"/>
<remap from="~/input/obstacle_pointcloud" to="$(var input/obstacle_pointcloud)"/>
<remap from="~/output/objects" to="$(var output/objects)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<arg name="input/occupancy_grid_map" default="/perception/object_recognition/detection/validation/occupancy_grid_based/single_frame_occupancy_grid_map"/>
<arg name="occupancy_grid_map_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/laserscan_based_occupancy_grid_map.param.yaml"/>
<arg name="occupancy_grid_map_updater_param_path" default="$(find-pkg-share probabilistic_occupancy_grid_map)/config/binary_bayes_filter_updater.param.yaml"/>
<arg name="occupancy_grid_based_validator_param_path" default="$(find-pkg-share detected_object_validation)/config/occupancy_grid_based_validator_param_path.param.yaml"/>
<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"/>

<node pkg="probabilistic_occupancy_grid_map" exec="laserscan_based_occupancy_grid_map_node" name="single_frame_laserscan_occupancy_grid_map" output="screen">
<remap from="~/input/laserscan" to="$(var input/laserscan)"/>
Expand All @@ -19,7 +19,7 @@
<param from="$(var occupancy_grid_map_updater_param_path)"/>
</node>

<node pkg="detected_object_validation" exec="occupancy_grid_based_validator_node" name="occupancy_grid_based_validator_node" output="screen">
<node pkg="autoware_detected_object_validation" exec="occupancy_grid_based_validator_node" name="occupancy_grid_based_validator_node" output="screen">
<remap from="~/input/detected_objects" to="$(var input/detected_objects)"/>
<remap from="~/input/occupancy_grid_map" to="$(var input/occupancy_grid_map)"/>
<remap from="~/output/objects" to="$(var output/objects)"/>
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>detected_object_validation</name>
<name>autoware_detected_object_validation</name>
<version>1.0.0</version>
<description>The ROS 2 detected_object_validation package</description>
<maintainer email="[email protected]">Yukihiro Saito</maintainer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ std::shared_ptr<ObjectPositionFilterNode> generateNode()
{
auto node_options = rclcpp::NodeOptions{};
const auto detected_object_validation_dir =
ament_index_cpp::get_package_share_directory("detected_object_validation");
ament_index_cpp::get_package_share_directory("autoware_detected_object_validation");
node_options.arguments(
{"--ros-args", "--params-file",
detected_object_validation_dir + "/config/object_position_filter.param.yaml"});
Expand Down
2 changes: 1 addition & 1 deletion perception/autoware_raindrop_cluster_filter/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>autoware_cmake</buildtool_depend>
<depend>autoware_detected_object_validation</depend>
<depend>autoware_lanelet2_extension</depend>
<depend>autoware_universe_utils</depend>
<depend>detected_object_validation</depend>
<depend>message_filters</depend>
<depend>nav_msgs</depend>
<depend>pcl_conversions</depend>
Expand Down

0 comments on commit af24b26

Please sign in to comment.