Skip to content

Commit ff4790f

Browse files
Merge pull request autowarefoundation#212 from tier4/sync-awf-upstream
chore: sync awf/autoware_launch
2 parents 0b8d047 + 28c86e6 commit ff4790f

File tree

14 files changed

+269
-10
lines changed

14 files changed

+269
-10
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**:
2+
ros__parameters:
3+
class_names: ["CAR", "TRUCK", "BUS", "BICYCLE", "PEDESTRIAN"]
4+
point_feature_size: 4
5+
max_voxel_size: 40000
6+
point_cloud_range: [-76.8, -76.8, -4.0, 76.8, 76.8, 6.0]
7+
voxel_size: [0.32, 0.32, 10.0]
8+
downsample_factor: 1
9+
encoder_in_feature_size: 9
10+
# post-process params
11+
circle_nms_dist_threshold: 0.5
12+
iou_nms_target_class_names: ["CAR"]
13+
iou_nms_search_distance_2d: 10.0
14+
iou_nms_threshold: 0.1
15+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/**:
2+
ros__parameters:
3+
class_names: ["CAR", "TRUCK", "BUS", "BICYCLE", "PEDESTRIAN"]
4+
point_feature_size: 4
5+
max_voxel_size: 40000
6+
point_cloud_range: [-76.8, -76.8, -4.0, 76.8, 76.8, 6.0]
7+
voxel_size: [0.32, 0.32, 10.0]
8+
downsample_factor: 2
9+
encoder_in_feature_size: 9
10+
# post-process params
11+
circle_nms_dist_threshold: 0.5
12+
iou_nms_target_class_names: ["CAR"]
13+
iou_nms_search_distance_2d: 10.0
14+
iou_nms_threshold: 0.1
15+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
/**:
2+
ros__parameters:
3+
allow_remapping_by_area_matrix:
4+
# NOTE(kl): We turn all vehicles into trailers if they go over 3x12 [m^2].
5+
# NOTE(kl): We turn cars into trucks if they have an area between 2.2 x 5.5 and 3.0 * 12.0 [m^2]
6+
# row: original class. column: class to remap to
7+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE,PEDESTRIAN
8+
[0, 0, 0, 0, 0, 0, 0, 0, #UNKNOWN
9+
0, 0, 1, 0, 1, 0, 0, 0, #CAR
10+
0, 0, 0, 0, 1, 0, 0, 0, #TRUCK
11+
0, 0, 0, 0, 1, 0, 0, 0, #BUS
12+
0, 0, 0, 0, 0, 0, 0, 0, #TRAILER
13+
0, 0, 0, 0, 0, 0, 0, 0, #MOTORBIKE
14+
0, 0, 0, 0, 0, 0, 0, 0, #BICYCLE
15+
0, 0, 0, 0, 0, 0, 0, 0] #PEDESTRIAN
16+
17+
min_area_matrix:
18+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
19+
[ 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #UNKNOWN
20+
0.000, 0.000, 12.100, 0.000, 36.000, 0.000, 0.000, 0.000, #CAR
21+
0.000, 0.000, 0.000, 0.000, 36.000, 0.000, 0.000, 0.000, #TRUCK
22+
0.000, 0.000, 0.000, 0.000, 36.000, 0.000, 0.000, 0.000, #BUS
23+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #TRAILER
24+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #MOTORBIKE
25+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #BICYCLE
26+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000] #PEDESTRIAN
27+
28+
29+
max_area_matrix:
30+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
31+
[ 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #UNKNOWN
32+
0.000, 0.000, 36.000, 0.000, inf, 0.000, 0.000, 0.000, #CAR
33+
0.000, 0.000, 0.000, 0.000, inf, 0.000, 0.000, 0.000, #TRUCK
34+
0.000, 0.000, 0.000, 0.000, inf, 0.000, 0.000, 0.000, #BUS
35+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #TRAILER
36+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #MOTORBIKE
37+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #BICYCLE
38+
0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000] #PEDESTRIAN
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
/**:
2+
ros__parameters:
3+
class_names: ["CAR", "TRUCK", "BUS", "BICYCLE", "PEDESTRIAN"]
4+
point_feature_size: 9 # x, y, z, time-lag and car, pedestrian, bicycle
5+
max_voxel_size: 40000
6+
point_cloud_range: [-102.4, -102.4, -4.0, 102.4, 102.4, 6.0]
7+
voxel_size: [0.32, 0.32, 10.0]
8+
downsample_factor: 1
9+
encoder_in_feature_size: 14
10+
yaw_norm_thresholds: [0.3, 0.3, 0.3, 0.3, 0.0]
11+
# post-process params
12+
circle_nms_dist_threshold: 0.5
13+
iou_nms_target_class_names: ["CAR"]
14+
iou_nms_search_distance_2d: 10.0
15+
iou_nms_threshold: 0.1
16+
# omp params
17+
omp_num_threads: 1

autoware_launch/config/perception/object_recognition/detection/pointcloud_filter/pointcloud_map_filter.param.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
# distance threshold for compare compare
1010
distance_threshold: 0.5
1111

12+
# ratio to reduce voxel_leaf_size and neighbor points distance threshold in z axis
13+
downsize_ratio_z_axis: 0.6
14+
1215
# publish voxelized map pointcloud for debug
1316
publish_debug_pcd: False
1417

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
/**:
2+
ros__parameters:
3+
can_assign_matrix:
4+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE,PEDESTRIAN <-Measurement
5+
[1, 0, 0, 0, 0, 0, 0, 0, #UNKNOWN <-Tracker
6+
0, 1, 1, 1, 1, 0, 0, 0, #CAR
7+
0, 1, 1, 1, 1, 0, 0, 0, #TRUCK
8+
0, 1, 1, 1, 1, 0, 0, 0, #BUS
9+
0, 1, 1, 1, 1, 0, 0, 0, #TRAILER
10+
0, 0, 0, 0, 0, 1, 1, 1, #MOTORBIKE
11+
0, 0, 0, 0, 0, 1, 1, 1, #BICYCLE
12+
0, 0, 0, 0, 0, 1, 1, 1] #PEDESTRIAN
13+
14+
max_dist_matrix:
15+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
16+
[4.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, #UNKNOWN
17+
4.0, 4.0, 5.0, 5.0, 5.0, 1.0, 1.0, 1.0, #CAR
18+
4.0, 2.0, 5.0, 5.0, 5.0, 1.0, 1.0, 1.0, #TRUCK
19+
4.0, 2.0, 5.0, 5.0, 5.0, 1.0, 1.0, 1.0, #BUS
20+
4.0, 2.0, 5.0, 5.0, 5.0, 1.0, 1.0, 1.0, #TRAILER
21+
3.0, 1.0, 1.0, 1.0, 1.0, 3.0, 3.0, 2.0, #MOTORBIKE
22+
3.0, 1.0, 1.0, 1.0, 1.0, 3.0, 3.0, 2.0, #BICYCLE
23+
2.0, 1.0, 1.0, 1.0, 1.0, 3.0, 3.0, 2.0] #PEDESTRIAN
24+
max_area_matrix:
25+
# NOTE: The size of truck is 12 m length x 3 m width.
26+
# NOTE: The size of trailer is 20 m length x 3 m width.
27+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
28+
[100.00, 100.00, 100.00, 100.00, 100.00, 100.00, 100.00, 100.00, #UNKNOWN
29+
12.10, 12.10, 36.00, 60.00, 60.00, 10000.00, 10000.00, 10000.00, #CAR
30+
36.00, 12.10, 36.00, 60.00, 60.00, 10000.00, 10000.00, 10000.00, #TRUCK
31+
60.00, 12.10, 36.00, 60.00, 60.00, 10000.00, 10000.00, 10000.00, #BUS
32+
60.00, 12.10, 36.00, 60.00, 60.00, 10000.00, 10000.00, 10000.00, #TRAILER
33+
2.50, 10000.00, 10000.00, 10000.00, 10000.00, 2.50, 2.50, 1.00, #MOTORBIKE
34+
2.50, 10000.00, 10000.00, 10000.00, 10000.00, 2.50, 2.50, 1.00, #BICYCLE
35+
2.00, 10000.00, 10000.00, 10000.00, 10000.00, 1.50, 1.50, 1.00] #PEDESTRIAN
36+
min_area_matrix:
37+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
38+
[ 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, 0.000, #UNKNOWN
39+
3.600, 3.600, 6.000, 10.000, 10.000, 0.000, 0.000, 0.000, #CAR
40+
6.000, 3.600, 6.000, 10.000, 10.000, 0.000, 0.000, 0.000, #TRUCK
41+
10.000, 3.600, 6.000, 10.000, 10.000, 0.000, 0.000, 0.000, #BUS
42+
10.000, 3.600, 6.000, 10.000, 10.000, 0.000, 0.000, 0.000, #TRAILER
43+
0.001, 0.000, 0.000, 0.000, 0.000, 0.100, 0.100, 0.100, #MOTORBIKE
44+
0.001, 0.000, 0.000, 0.000, 0.000, 0.100, 0.100, 0.100, #BICYCLE
45+
0.001, 0.000, 0.000, 0.000, 0.000, 0.100, 0.100, 0.100] #PEDESTRIAN
46+
max_rad_matrix: # If value is greater than pi, it will be ignored.
47+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER MOTORBIKE, BICYCLE, PEDESTRIAN
48+
[3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, #UNKNOWN
49+
3.150, 1.047, 1.047, 1.047, 1.047, 3.150, 3.150, 3.150, #CAR
50+
3.150, 1.047, 1.047, 1.047, 1.047, 3.150, 3.150, 3.150, #TRUCK
51+
3.150, 1.047, 1.047, 1.047, 1.047, 3.150, 3.150, 3.150, #BUS
52+
3.150, 1.047, 1.047, 1.047, 1.047, 3.150, 3.150, 3.150, #TRAILER
53+
3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, #MOTORBIKE
54+
3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, #BICYCLE
55+
3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150, 3.150] #PEDESTRIAN
56+
57+
min_iou_matrix: # If value is negative, it will be ignored.
58+
#UNKNOWN, CAR, TRUCK, BUS, TRAILER, MOTORBIKE, BICYCLE, PEDESTRIAN
59+
[0.0001, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, #UNKNOWN
60+
0.1, -0.1, 0.2, 0.2, 0.2, 0.1, 0.1, 0.1, #CAR
61+
0.1, 0.2, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, #TRUCK
62+
0.1, 0.2, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, #BUS
63+
0.1, 0.2, 0.3, 0.3, 0.3, 0.1, 0.1, 0.1, #TRAILER
64+
0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, #MOTORBIKE
65+
0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, #BICYCLE
66+
0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.0001] #PEDESTRIAN
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**:
2+
ros__parameters:
3+
car_tracker: "linear_motion_tracker"
4+
truck_tracker: "linear_motion_tracker"
5+
bus_tracker: "linear_motion_tracker"
6+
trailer_tracker: "linear_motion_tracker"
7+
pedestrian_tracker: "linear_motion_tracker"
8+
bicycle_tracker: "linear_motion_tracker"
9+
motorcycle_tracker: "linear_motion_tracker"

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/avoidance/avoidance.param.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
target_object:
3333
car:
3434
is_target: true # [-]
35+
execute_num: 1 # [-]
3536
moving_speed_threshold: 1.0 # [m/s]
3637
moving_time_threshold: 1.0 # [s]
3738
max_expand_ratio: 0.0 # [-]
@@ -41,6 +42,7 @@
4142
safety_buffer_longitudinal: 0.0 # [m]
4243
truck:
4344
is_target: true
45+
execute_num: 1
4446
moving_speed_threshold: 1.0 # 3.6km/h
4547
moving_time_threshold: 1.0
4648
max_expand_ratio: 0.0
@@ -50,6 +52,7 @@
5052
safety_buffer_longitudinal: 0.0
5153
bus:
5254
is_target: true
55+
execute_num: 1
5356
moving_speed_threshold: 1.0 # 3.6km/h
5457
moving_time_threshold: 1.0
5558
max_expand_ratio: 0.0
@@ -59,6 +62,7 @@
5962
safety_buffer_longitudinal: 0.0
6063
trailer:
6164
is_target: true
65+
execute_num: 1
6266
moving_speed_threshold: 1.0 # 3.6km/h
6367
moving_time_threshold: 1.0
6468
max_expand_ratio: 0.0
@@ -68,6 +72,7 @@
6872
safety_buffer_longitudinal: 0.0
6973
unknown:
7074
is_target: true
75+
execute_num: 1
7176
moving_speed_threshold: 0.28 # 1.0km/h
7277
moving_time_threshold: 1.0
7378
max_expand_ratio: 0.0
@@ -77,6 +82,7 @@
7782
safety_buffer_longitudinal: 0.0
7883
bicycle:
7984
is_target: true
85+
execute_num: 1
8086
moving_speed_threshold: 0.28 # 1.0km/h
8187
moving_time_threshold: 1.0
8288
max_expand_ratio: 0.0
@@ -86,6 +92,7 @@
8692
safety_buffer_longitudinal: 1.0
8793
motorcycle:
8894
is_target: true
95+
execute_num: 1
8996
moving_speed_threshold: 1.0 # 3.6km/h
9097
moving_time_threshold: 1.0
9198
max_expand_ratio: 0.0
@@ -95,6 +102,7 @@
95102
safety_buffer_longitudinal: 1.0
96103
pedestrian:
97104
is_target: true
105+
execute_num: 1
98106
moving_speed_threshold: 0.28 # 1.0km/h
99107
moving_time_threshold: 1.0
100108
max_expand_ratio: 0.0
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,82 @@
11
/**:
22
ros__parameters:
33
avoidance_by_lane_change:
4-
execute_object_num: 1
5-
execute_object_longitudinal_margin: 0.0
6-
execute_only_when_lane_change_finish_before_object: true
4+
execute_object_longitudinal_margin: 80.0
5+
execute_only_when_lane_change_finish_before_object: false
6+
7+
# avoidance is performed for the object type with true
8+
target_object:
9+
car:
10+
is_target: true # [-]
11+
execute_num: 2 # [-]
12+
moving_speed_threshold: 1.0 # [m/s]
13+
moving_time_threshold: 1.0 # [s]
14+
max_expand_ratio: 0.0 # [-]
15+
envelope_buffer_margin: 0.3 # [m]
16+
avoid_margin_lateral: 0.0 # [m]
17+
safety_buffer_lateral: 0.0 # [m]
18+
truck:
19+
is_target: true
20+
execute_num: 2
21+
moving_speed_threshold: 1.0 # 3.6km/h
22+
moving_time_threshold: 1.0
23+
max_expand_ratio: 0.0
24+
envelope_buffer_margin: 0.3
25+
avoid_margin_lateral: 0.0
26+
safety_buffer_lateral: 0.0
27+
bus:
28+
is_target: true
29+
execute_num: 2
30+
moving_speed_threshold: 1.0 # 3.6km/h
31+
moving_time_threshold: 1.0
32+
max_expand_ratio: 0.0
33+
envelope_buffer_margin: 0.3
34+
avoid_margin_lateral: 0.0
35+
safety_buffer_lateral: 0.0
36+
trailer:
37+
is_target: true
38+
execute_num: 2
39+
moving_speed_threshold: 1.0 # 3.6km/h
40+
moving_time_threshold: 1.0
41+
max_expand_ratio: 0.0
42+
envelope_buffer_margin: 0.3
43+
avoid_margin_lateral: 0.0
44+
safety_buffer_lateral: 0.0
45+
unknown:
46+
is_target: true
47+
execute_num: 1
48+
moving_speed_threshold: 0.28 # 1.0km/h
49+
moving_time_threshold: 1.0
50+
max_expand_ratio: 0.0
51+
envelope_buffer_margin: 0.3
52+
avoid_margin_lateral: 0.0
53+
safety_buffer_lateral: 0.0
54+
bicycle:
55+
is_target: false
56+
execute_num: 2
57+
moving_speed_threshold: 0.28 # 1.0km/h
58+
moving_time_threshold: 1.0
59+
max_expand_ratio: 0.0
60+
envelope_buffer_margin: 0.8
61+
avoid_margin_lateral: 0.0
62+
safety_buffer_lateral: 1.0
63+
motorcycle:
64+
is_target: false
65+
execute_num: 2
66+
moving_speed_threshold: 1.0 # 3.6km/h
67+
moving_time_threshold: 1.0
68+
max_expand_ratio: 0.0
69+
envelope_buffer_margin: 0.8
70+
avoid_margin_lateral: 0.0
71+
safety_buffer_lateral: 1.0
72+
pedestrian:
73+
is_target: false
74+
execute_num: 2
75+
moving_speed_threshold: 0.28 # 1.0km/h
76+
moving_time_threshold: 1.0
77+
max_expand_ratio: 0.0
78+
envelope_buffer_margin: 0.8
79+
avoid_margin_lateral: 0.0
80+
safety_buffer_lateral: 1.0
81+
lower_distance_for_polygon_expansion: 0.0 # [m]
82+
upper_distance_for_polygon_expansion: 1.0 # [m]

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/scene_module_manager.param.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@
6767
priority: 5
6868
max_module_size: 1
6969

70-
# NOTE: This module is unstable. Deprecated for now.
7170
avoidance_by_lc:
72-
enable_module: false
71+
enable_module: true
7372
enable_rtc: true
7473
enable_simultaneous_execution_as_approved_module: false
7574
enable_simultaneous_execution_as_candidate_module: false

autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager.param.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
- "lane_change_right"
1212
- "avoidance_left"
1313
- "avoidance_right"
14+
- "avoidance_by_lane_change_left"
15+
- "avoidance_by_lane_change_right"
1416
- "goal_planner"
1517
- "start_planner"
1618
- "intersection_occlusion"
@@ -26,6 +28,8 @@
2628
- "lane_change_right"
2729
- "avoidance_left"
2830
- "avoidance_right"
31+
- "avoidance_by_lane_change_left"
32+
- "avoidance_by_lane_change_right"
2933
- "goal_planner"
3034
- "start_planner"
3135
- "intersection_occlusion"

autoware_launch/config/planning/scenario_planning/lane_driving/motion_planning/path_sampler/path_sampler.param.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
max_curvature: 0.1 # [m⁻¹] maximum curvature of a sampled path
1717
min_curvature: -0.1 # [m⁻¹] minimum curvature of a sampled path
1818
soft:
19-
lateral_deviation_weight: 0.1 # cost weight for lateral deviation between the end of a sampled path and the reference path
19+
lateral_deviation_weight: 1.0 # cost weight for lateral deviation between the end of a sampled path and the reference path
2020
length_weight: 1.0 # cost weight for the length of a sampled path
2121
curvature_weight: 1.0 # cost weight for the curvature of a sampled path
2222
sampling:

autoware_launch/launch/components/tier4_perception_component.launch.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,19 @@
5555
name="object_recognition_detection_object_merger_distance_threshold_list_path"
5656
value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/object_merger/overlapped_judge.param.yaml"
5757
/>
58+
<arg name="object_recognition_detection_lidar_model_param_path" value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/detection/lidar_model"/>
5859
<arg
5960
name="object_recognition_tracking_multi_object_tracker_data_association_matrix_param_path"
6061
value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/tracking/multi_object_tracker/data_association_matrix.param.yaml"
6162
/>
63+
<arg
64+
name="object_recognition_tracking_radar_object_tracker_data_association_matrix_param_path"
65+
value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/tracking/radar_object_tracker/data_association_matrix.param.yaml"
66+
/>
67+
<arg
68+
name="object_recognition_tracking_radar_object_tracker_tracking_setting_param_path"
69+
value="$(find-pkg-share autoware_launch)/config/perception/object_recognition/tracking/radar_object_tracker/default_tracker.param.yaml"
70+
/>
6271

6372
<!-- obstacle segmentation -->
6473
<arg

0 commit comments

Comments
 (0)