refactor(safety_check): use safety check common param struct (autowar…

…efoundation#526) Signed-off-by: satoshi-ota <satoshi.ota928@gmail.com>
iwatake2222 · Aug 23, 2023 · 407baae · 407baae
1 parent b4a03f0
commit 407baae
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml b/...nning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml
@@ -146,6 +146,14 @@
         safety_check_backward_distance: 100.0            # [m]
         safety_check_hysteresis_factor: 2.0              # [-]
         safety_check_ego_offset: 1.0                     # [m]
+        # rss parameters
+        expected_front_deceleration: -1.0                # [m/ss]
+        expected_rear_deceleration: -1.0                 # [m/ss]
+        rear_vehicle_reaction_time: 2.0                  # [s]
+        rear_vehicle_safety_time_margin: 1.0             # [s]
+        lateral_distance_max_threshold: 2.0              # [m]
+        longitudinal_distance_min_threshold: 3.0         # [m]
+        longitudinal_velocity_delta_time: 0.8            # [s]
 
       # For avoidance maneuver
       avoidance:

diff --git a/...ing/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml b/...ing/lane_driving/behavior_planning/behavior_path_planner/behavior_path_planner.param.yaml
@@ -29,19 +29,6 @@
 
     visualize_maximum_drivable_area: true
 
-    lateral_distance_max_threshold: 1.7
-    longitudinal_distance_min_threshold: 3.0
-    longitudinal_velocity_delta_time: 0.8
-
-    expected_front_deceleration: -1.0
-    expected_rear_deceleration: -1.0
-
-    expected_front_deceleration_for_abort: -1.0
-    expected_rear_deceleration_for_abort: -2.0
-
-    rear_vehicle_reaction_time: 2.0
-    rear_vehicle_safety_time_margin: 1.0
-
     lane_following:
       drivable_area_right_bound_offset: 0.0
       drivable_area_left_bound_offset: 0.0

diff --git a/...g/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml b/...g/lane_driving/behavior_planning/behavior_path_planner/lane_change/lane_change.param.yaml
@@ -26,6 +26,18 @@
       min_longitudinal_acc: -1.0
       max_longitudinal_acc: 1.0
 
+      # safety check
+      safety_check:
+        expected_front_deceleration: -1.0
+        expected_rear_deceleration: -1.0
+        expected_front_deceleration_for_abort: -1.0
+        expected_rear_deceleration_for_abort: -2.0
+        rear_vehicle_reaction_time: 2.0
+        rear_vehicle_safety_time_margin: 1.0
+        lateral_distance_max_threshold: 2.0
+        longitudinal_distance_min_threshold: 3.0
+        longitudinal_velocity_delta_time: 0.8
+
       # lateral acceleration map
       lateral_acceleration:
         velocity: [0.0, 4.0, 10.0]