style(pre-commit): autofix

autowarefoundation · Mar 6, 2025 · 14e67bf · 14e67bf
1 parent 54776f0
commit 14e67bf
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/...locity_planner/autoware_motion_velocity_obstacle_stop_module/src/obstacle_stop_module.cpp b/...locity_planner/autoware_motion_velocity_obstacle_stop_module/src/obstacle_stop_module.cpp
@@ -890,15 +890,19 @@ double ObstacleStopModule::calc_desired_stop_margin(
   const double dist_to_collide_on_ref_traj)
 {
   // calculate default stop margin
-  const double default_stop_margin = [&]() {
-    const auto ref_traj_length =
-      autoware::motion_utils::calcSignedArcLength(traj_points, 0, traj_points.size() - 1);
-    if (dist_to_collide_on_ref_traj > ref_traj_length) {
-      // Use terminal margin (terminal_stop_margin) for obstacle stop
-      return stop_planning_param_.terminal_stop_margin;
-    }
-    return stop_planning_param_.stop_margin;
-  }() + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.additional_stop_margin_opposing_traffic : 0.0;
+  const double default_stop_margin =
+    [&]() {
+      const auto ref_traj_length =
+        autoware::motion_utils::calcSignedArcLength(traj_points, 0, traj_points.size() - 1);
+      if (dist_to_collide_on_ref_traj > ref_traj_length) {
+        // Use terminal margin (terminal_stop_margin) for obstacle stop
+        return stop_planning_param_.terminal_stop_margin;
+      }
+      return stop_planning_param_.stop_margin;
+    }() +
+        (stop_obstacle.velocity < 0.0)
+      ? stop_planning_param_.additional_stop_margin_opposing_traffic
+      : 0.0;
 
   // calculate stop margin on curve
   const double stop_margin_on_curve = calc_margin_from_obstacle_on_curve(
@@ -915,10 +919,14 @@ double ObstacleStopModule::calc_desired_stop_margin(
     const double stop_dist_diff =
       closest_behavior_stop_dist_on_ref_traj - (dist_to_collide_on_ref_traj - stop_margin_on_curve);
     if (0.0 < stop_dist_diff && stop_dist_diff < stop_margin_on_curve) {
-      return stop_planning_param_.min_behavior_stop_margin + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.additional_stop_margin_opposing_traffic : 0.0;
+      return stop_planning_param_.min_behavior_stop_margin + (stop_obstacle.velocity < 0.0)
+               ? stop_planning_param_.additional_stop_margin_opposing_traffic
+               : 0.0;
     }
   }
-  return stop_margin_on_curve + (stop_obstacle.velocity < 0.0) ? stop_planning_param_.additional_stop_margin_opposing_traffic : 0.0;
+  return stop_margin_on_curve + (stop_obstacle.velocity < 0.0)
+           ? stop_planning_param_.additional_stop_margin_opposing_traffic
+           : 0.0;
 }
 
 std::optional<double> ObstacleStopModule::calc_candidate_zero_vel_dist(

diff --git a/.../motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/src/parameters.hpp b/.../motion_velocity_planner/autoware_motion_velocity_obstacle_stop_module/src/parameters.hpp
@@ -186,8 +186,8 @@ struct StopPlanningParam
       get_or_declare_parameter<double>(node, "obstacle_stop.stop_planning.terminal_stop_margin");
     min_behavior_stop_margin = get_or_declare_parameter<double>(
       node, "obstacle_stop.stop_planning.min_behavior_stop_margin");
-    additional_stop_margin_opposing_traffic =
-      get_or_declare_parameter<double>(node, "obstacle_stop.stop_planning.additional_stop_margin_opposing_traffic");
+    additional_stop_margin_opposing_traffic = get_or_declare_parameter<double>(
+      node, "obstacle_stop.stop_planning.additional_stop_margin_opposing_traffic");
     hold_stop_velocity_threshold = get_or_declare_parameter<double>(
       node, "obstacle_stop.stop_planning.hold_stop_velocity_threshold");
     hold_stop_distance_threshold = get_or_declare_parameter<double>(