Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(detected_object_validation): change the points_num of the validator to be set class by class #5177

Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,7 @@
<arg name="input/detected_objects" value="$(var lidar_detection_model)/roi_fusion/objects"/>
<arg name="input/obstacle_pointcloud" value="$(var validator/input/obstacle_pointcloud)"/>
<arg name="output/objects" value="$(var lidar_detection_model)/validation/objects"/>
<arg name="obstacle_pointcloud_based_validator_param_path" value="$(var object_recognition_detection_obstacle_pointcloud_based_validator_param_path)"/>
</include>
</group>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@
<arg name="input/detected_objects" value="$(var lidar_detection_model)/roi_fusion/objects"/>
<arg name="input/obstacle_pointcloud" value="$(var validator/input/obstacle_pointcloud)"/>
<arg name="output/objects" value="$(var lidar_detection_model)/validation/objects"/>
<arg name="obstacle_pointcloud_based_validator_param_path" value="$(var object_recognition_detection_obstacle_pointcloud_based_validator_param_path)"/>
</include>
</group>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@
<arg name="input/detected_objects" value="$(var lidar_detection_model)/objects"/>
<arg name="input/obstacle_pointcloud" value="$(var validator/input/obstacle_pointcloud)"/>
<arg name="output/objects" value="$(var lidar_detection_model)/validation/objects"/>
<arg name="obstacle_pointcloud_based_validator_param_path" value="$(var object_recognition_detection_obstacle_pointcloud_based_validator_param_path)"/>
</include>
</group>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<arg name="object_recognition_tracking_radar_object_tracker_tracking_setting_param_path"/>
<arg name="obstacle_segmentation_ground_segmentation_param_path"/>
<arg name="obstacle_segmentation_ground_segmentation_elevation_map_param_path"/>
<arg name="object_recognition_detection_obstacle_pointcloud_based_validator_param_path"/>
<arg name="occupancy_grid_map_method"/>
<arg name="occupancy_grid_map_param_path"/>
<arg name="occupancy_grid_map_updater"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**:
ros__parameters:
min_points_num:
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
[10, 10, 10, 10, 10, 10, 10, 10]

max_points_num:
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
[10, 10, 10, 10, 10, 10, 10, 10]

min_points_and_distance_ratio:
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
[800.0, 800.0, 800.0, 800.0, 800.0, 800.0, 800.0, 800.0]
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,16 @@
#include <tf2_ros/buffer.h>
#include <tf2_ros/transform_listener.h>

#include <map>
#include <memory>
#include <optional>

namespace obstacle_pointcloud_based_validator
{
struct PointsNumThresholdParam
{
size_t min_points_num;
size_t max_points_num;
float min_points_and_distance_ratio;
std::map<uint8_t, int64_t> min_points_num;
std::map<uint8_t, int64_t> max_points_num;
std::map<uint8_t, double> min_points_and_distance_ratio;
};
class ObstaclePointCloudBasedValidator : public rclcpp::Node
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
<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"/>

<node pkg="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)"/>
<param name="enable_debugger" value="false"/>
<param from="$(var obstacle_pointcloud_based_validator_param_path)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,17 @@

namespace
{
template <typename T>
inline std::map<uint8_t, T> convertListToMap(const std::vector<T> & input_vector)

Check warning on line 41 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L41

Added line #L41 was not covered by tests
{
std::map<uint8_t, T> output_map;
uint8_t label = 0;
for (const T & v : input_vector) {
output_map.insert(std::make_pair(label, v));
label++;

Check warning on line 47 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L45-L47

Added lines #L45 - L47 were not covered by tests
}
return output_map;

Check warning on line 49 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L49

Added line #L49 was not covered by tests
}
yukke42 marked this conversation as resolved.
Show resolved Hide resolved
inline pcl::PointXY toPCL(const double x, const double y)
{
pcl::PointXY pcl_point;
Expand Down Expand Up @@ -92,10 +103,12 @@
objects_pub_ = create_publisher<autoware_auto_perception_msgs::msg::DetectedObjects>(
"~/output/objects", rclcpp::QoS{1});

points_num_threshold_param_.min_points_num = declare_parameter<int>("min_points_num", 10);
points_num_threshold_param_.max_points_num = declare_parameter<int>("max_points_num", 10);
points_num_threshold_param_.min_points_num =
convertListToMap(declare_parameter<std::vector<int64_t>>("min_points_num"));

Check warning on line 107 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L107

Added line #L107 was not covered by tests
points_num_threshold_param_.max_points_num =
convertListToMap(declare_parameter<std::vector<int64_t>>("max_points_num"));

Check warning on line 109 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L109

Added line #L109 was not covered by tests
points_num_threshold_param_.min_points_and_distance_ratio =
declare_parameter<float>("min_points_and_distance_ratio", 800.0);
convertListToMap(declare_parameter<std::vector<double>>("min_points_and_distance_ratio"));

Check warning on line 111 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L111

Added line #L111 was not covered by tests

const bool enable_debugger = declare_parameter<bool>("enable_debugger", false);
if (enable_debugger) debugger_ = std::make_shared<Debugger>(this);
Expand Down Expand Up @@ -134,6 +147,7 @@

for (size_t i = 0; i < transformed_objects.objects.size(); ++i) {
const auto & transformed_object = transformed_objects.objects.at(i);
const auto object_label_id = transformed_object.classification.front().label;

Check warning on line 150 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L150

Added line #L150 was not covered by tests
const auto & object = input_objects->objects.at(i);
const auto & transformed_object_position =
transformed_object.kinematics.pose_with_covariance.pose.position;
Expand All @@ -155,13 +169,17 @@
if (debugger_) debugger_->addNeighborPointcloud(neighbor_pointcloud);

// Filter object that have few pointcloud in them.
// TODO(badai-nguyen) add 3d validator option
const auto num = getPointCloudNumWithinPolygon(transformed_object, neighbor_pointcloud);
const auto object_distance =
std::hypot(transformed_object_position.x, transformed_object_position.y);
size_t min_pointcloud_num = std::clamp(
static_cast<size_t>(
points_num_threshold_param_.min_points_and_distance_ratio / object_distance + 0.5f),
points_num_threshold_param_.min_points_num, points_num_threshold_param_.max_points_num);
points_num_threshold_param_.min_points_and_distance_ratio.at(object_label_id) /
object_distance +

Check warning on line 179 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L178-L179

Added lines #L178 - L179 were not covered by tests
0.5f),
static_cast<size_t>(points_num_threshold_param_.min_points_num.at(object_label_id)),
static_cast<size_t>(points_num_threshold_param_.max_points_num.at(object_label_id)));

Check warning on line 182 in perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp

View check run for this annotation

Codecov / codecov/patch

perception/detected_object_validation/src/obstacle_pointcloud_based_validator.cpp#L181-L182

Added lines #L181 - L182 were not covered by tests
if (num) {
(min_pointcloud_num <= num.value()) ? output.objects.push_back(object)
: removed_objects.objects.push_back(object);
Expand Down
Loading