Skip to content

Commit 8d6d3f4

Browse files
style(pre-commit): autofix
1 parent 18e9a2b commit 8d6d3f4

File tree

2 files changed

+19
-13
lines changed

2 files changed

+19
-13
lines changed

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/src/obstacle_stop_module.cpp

+17-11
Original file line numberDiff line numberDiff line change
@@ -890,15 +890,19 @@ double ObstacleStopModule::calc_desired_stop_margin(
890890
const double dist_to_collide_on_ref_traj)
891891
{
892892
// calculate default stop margin
893-
const double default_stop_margin = [&]() {
894-
const auto ref_traj_length =
895-
autoware::motion_utils::calcSignedArcLength(traj_points, 0, traj_points.size() - 1);
896-
if (dist_to_collide_on_ref_traj > ref_traj_length) {
897-
// Use terminal margin (terminal_stop_margin) for obstacle stop
898-
return stop_planning_param_.terminal_stop_margin;
899-
}
900-
return stop_planning_param_.stop_margin;
901-
}() + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.stop_margin_opposing_traffic : 0.0;
893+
const double default_stop_margin =
894+
[&]() {
895+
const auto ref_traj_length =
896+
autoware::motion_utils::calcSignedArcLength(traj_points, 0, traj_points.size() - 1);
897+
if (dist_to_collide_on_ref_traj > ref_traj_length) {
898+
// Use terminal margin (terminal_stop_margin) for obstacle stop
899+
return stop_planning_param_.terminal_stop_margin;
900+
}
901+
return stop_planning_param_.stop_margin;
902+
}() +
903+
(stop_obstacle.velocity < 0.0)
904+
? stop_planning_param_.stop_margin_opposing_traffic
905+
: 0.0;
902906

903907
// calculate stop margin on curve
904908
const double stop_margin_on_curve = calc_margin_from_obstacle_on_curve(
@@ -915,10 +919,12 @@ double ObstacleStopModule::calc_desired_stop_margin(
915919
const double stop_dist_diff =
916920
closest_behavior_stop_dist_on_ref_traj - (dist_to_collide_on_ref_traj - stop_margin_on_curve);
917921
if (0.0 < stop_dist_diff && stop_dist_diff < stop_margin_on_curve) {
918-
return stop_planning_param_.min_behavior_stop_margin + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.stop_margin_opposing_traffic;
922+
return stop_planning_param_.min_behavior_stop_margin + (stop_obstacle.velocity < 0.0)
923+
? stop_planning_param_.stop_margin_opposing_traffic;
919924
}
920925
}
921-
return stop_margin_on_curve + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.stop_margin_opposing_traffic;
926+
return stop_margin_on_curve + (stop_obstacle.velocity < 0.0)
927+
? stop_planning_param_.stop_margin_opposing_traffic;
922928
}
923929

924930
std::optional<double> ObstacleStopModule::calc_candidate_zero_vel_dist(

planning/motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/src/parameters.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -186,8 +186,8 @@ struct StopPlanningParam
186186
get_or_declare_parameter<double>(node, "obstacle_stop.stop_planning.terminal_stop_margin");
187187
min_behavior_stop_margin = get_or_declare_parameter<double>(
188188
node, "obstacle_stop.stop_planning.min_behavior_stop_margin");
189-
stop_margin_opposing_traffic =
190-
get_or_declare_parameter<double>(node, "obstacle_stop.stop_planning.stop_margin_opposing_traffic");
189+
stop_margin_opposing_traffic = get_or_declare_parameter<double>(
190+
node, "obstacle_stop.stop_planning.stop_margin_opposing_traffic");
191191
hold_stop_velocity_threshold = get_or_declare_parameter<double>(
192192
node, "obstacle_stop.stop_planning.hold_stop_velocity_threshold");
193193
hold_stop_distance_threshold = get_or_declare_parameter<double>(

0 commit comments

Comments
 (0)