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

feat(autonomous_emergency_braking): aeb for backwards driving #7279

Merged
Show file tree
Hide file tree
Changes from all 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 @@ -198,8 +198,12 @@ class CollisionDataKeeper

const auto nearest_idx = motion_utils::findNearestIndex(path, nearest_collision_point);
const auto & nearest_path_pose = path.at(nearest_idx);
const auto & traj_yaw = tf2::getYaw(nearest_path_pose.orientation);
const auto estimated_velocity = p_vel * std::cos(p_yaw - traj_yaw) + current_ego_speed;
// When the ego moves backwards, the direction of movement axis is reversed
const auto & traj_yaw = (current_ego_speed > 0.0)
? tf2::getYaw(nearest_path_pose.orientation)
: tf2::getYaw(nearest_path_pose.orientation) + M_PI;
const auto estimated_velocity =
p_vel * std::cos(p_yaw - traj_yaw) + std::abs(current_ego_speed);

// Current RSS distance calculation does not account for negative velocities
return (estimated_velocity > 0.0) ? estimated_velocity : 0.0;
Expand Down
35 changes: 23 additions & 12 deletions control/autoware_autonomous_emergency_braking/src/node.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright 2022 TIER IV, Inc.

Check notice on line 1 in control/autoware_autonomous_emergency_braking/src/node.cpp

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

ℹ Getting worse: Overall Code Complexity

The mean cyclomatic complexity increases from 4.35 to 4.41, threshold = 4. This file has many conditional statements (e.g. if, for, while) across its implementation, leading to lower code health. Avoid adding more conditionals.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -364,8 +364,9 @@
}

// step2. create velocity data check if the vehicle stops or not
constexpr double min_moving_velocity_th{0.1};
const double current_v = current_velocity_ptr_->longitudinal_velocity;
if (current_v < 0.1) {
if (std::abs(current_v) < min_moving_velocity_th) {

Check warning on line 369 in control/autoware_autonomous_emergency_braking/src/node.cpp

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

❌ Getting worse: Complex Method

AEB::checkCollision already has high cyclomatic complexity, and now it increases in Lines of Code from 81 to 82. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.
return false;
}

Expand Down Expand Up @@ -463,7 +464,8 @@
{
const double & obj_v = closest_object.velocity;
const double & t = t_response_;
const double rss_dist = current_v * t + (current_v * current_v) / (2 * std::fabs(a_ego_min_)) -
const double rss_dist = std::abs(current_v) * t +
(current_v * current_v) / (2 * std::fabs(a_ego_min_)) -
obj_v * obj_v / (2 * std::fabs(a_obj_min_)) + longitudinal_offset_;
if (closest_object.distance_to_object < rss_dist) {
// collision happens
Expand All @@ -487,7 +489,7 @@
ini_pose.orientation = tier4_autoware_utils::createQuaternionFromYaw(curr_yaw);
path.push_back(ini_pose);

if (curr_v < 0.1) {
if (std::abs(curr_v) < 0.1) {
// if current velocity is too small, assume it stops at the same point
return path;
}
Expand Down Expand Up @@ -610,22 +612,30 @@
}

// select points inside the ego footprint path
const auto current_p = tier4_autoware_utils::createPoint(
ego_path[0].position.x, ego_path[0].position.y, ego_path[0].position.z);
const auto current_p = [&]() {
const auto & first_point_of_path = ego_path.front();
const auto & p = first_point_of_path.position;
return tier4_autoware_utils::createPoint(p.x, p.y, p.z);
}();

for (const auto & p : *points_belonging_to_cluster_hulls) {
const auto obj_position = tier4_autoware_utils::createPoint(p.x, p.y, p.z);
const double dist_ego_to_object =
motion_utils::calcSignedArcLength(ego_path, current_p, obj_position) -
vehicle_info_.max_longitudinal_offset_m;
// objects behind ego are ignored
if (dist_ego_to_object < 0.0) continue;
const double obj_arc_length =
motion_utils::calcSignedArcLength(ego_path, current_p, obj_position);
if (std::isnan(obj_arc_length)) continue;

// If the object is behind the ego, we need to use the backward long offset. The distance should
// be a positive number in any case
const bool is_object_in_front_of_ego = obj_arc_length > 0.0;
const double dist_ego_to_object = (is_object_in_front_of_ego)
? obj_arc_length - vehicle_info_.max_longitudinal_offset_m
: obj_arc_length + vehicle_info_.min_longitudinal_offset_m;

ObjectData obj;
obj.stamp = stamp;
obj.position = obj_position;
obj.velocity = 0.0;
obj.distance_to_object = dist_ego_to_object;
obj.distance_to_object = std::abs(dist_ego_to_object);

Check warning on line 638 in control/autoware_autonomous_emergency_braking/src/node.cpp

View check run for this annotation

CodeScene Delta Analysis / CodeScene Cloud Delta Analysis (main)

❌ Getting worse: Complex Method

AEB::createObjectDataUsingPointCloudClusters increases in cyclomatic complexity from 12 to 13, threshold = 9. This function has many conditional statements (e.g. if, for, while), leading to lower code health. Avoid adding more conditionals and code to it without refactoring.

const Point2d obj_point(p.x, p.y);
for (const auto & ego_poly : ego_polys) {
Expand Down Expand Up @@ -721,7 +731,8 @@
closest_object_velocity_marker_array.text =
"Object velocity: " + std::to_string(obj.velocity) + " [m/s]\n";
closest_object_velocity_marker_array.text +=
"Object relative velocity to ego: " + std::to_string(obj.velocity - ego_velocity) + " [m/s]";
"Object relative velocity to ego: " + std::to_string(obj.velocity - std::abs(ego_velocity)) +
" [m/s]";
debug_markers.markers.push_back(closest_object_velocity_marker_array);
}
}
Expand Down
Loading