Skip to content

Commit a10f5cc

Browse files
vividfxmfcx
vividf
authored and
xmfcx
committed
fix: fix perception docs
Signed-off-by: vividf <yihsiang.fang@tier4.jp>
1 parent 421ec7d commit a10f5cc

File tree

5 files changed

+163
-112
lines changed

5 files changed

+163
-112
lines changed

‎perception/autoware_object_merger/schema/data_association_matrix.schema.json

+31-10
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,61 @@
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"title": "Data Association Matrix Parameters",
44
"type": "object",
5-
"properties": {
6-
"ros__parameters": {
5+
"definitions": {
6+
"data_association_matrix": {
77
"type": "object",
88
"properties": {
99
"can_assign_matrix": {
1010
"type": "array",
1111
"items": {
1212
"type": "number"
1313
},
14-
"description": "Assignment table for data association"
14+
"description": "Assignment table for data association.",
15+
"default": []
1516
},
1617
"max_dist_matrix": {
1718
"type": "array",
1819
"items": {
1920
"type": "number"
2021
},
21-
"description": "Maximum distance table for data association"
22+
"description": "Maximum distance table for data association.",
23+
"default": []
2224
},
2325
"max_rad_matrix": {
2426
"type": "array",
2527
"items": {
26-
"type": "number"
28+
"type": "number",
29+
"minimum": 0.0
2730
},
28-
"description": "Maximum angle table for data association. If value is greater than pi, it will be ignored."
31+
"description": "Maximum angle table for data association. If value is greater than pi, it will be ignored.",
32+
"default": []
2933
},
3034
"min_iou_matrix": {
3135
"type": "array",
3236
"items": {
33-
"type": "number"
37+
"type": "number",
38+
"minimum": 0.0
3439
},
35-
"description": "Minimum IoU threshold matrix for data association. If value is negative, it will be ignored."
40+
"description": "Minimum IoU threshold matrix for data association. If value is negative, it will be ignored.",
41+
"default": []
42+
}
43+
},
44+
"required": ["can_assign_matrix", "max_dist_matrix", "max_rad_matrix", "min_iou_matrix"],
45+
"additionalProperties": false
46+
}
47+
},
48+
"properties": {
49+
"/**": {
50+
"type": "object",
51+
"properties": {
52+
"ros__parameters": {
53+
"$ref": "#/definitions/data_association_matrix"
3654
}
3755
},
38-
"required": ["can_assign_matrix", "max_dist_matrix", "max_rad_matrix", "min_iou_matrix"]
56+
"required": ["ros__parameters"],
57+
"additionalProperties": false
3958
}
40-
}
59+
},
60+
"required": ["/**"],
61+
"additionalProperties": false
4162
}

‎perception/autoware_object_merger/schema/object_association_merger.schema.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
"remove_overlapped_unknown_objects",
4646
"base_link_frame_id",
4747
"priority_mode"
48-
]
48+
],
49+
"additionalProperties": false
4950
}
5051
},
5152
"properties": {
@@ -56,8 +57,10 @@
5657
"$ref": "#/definitions/object_association_merger"
5758
}
5859
},
59-
"required": ["ros__parameters"]
60+
"required": ["ros__parameters"],
61+
"additionalProperties": false
6062
}
6163
},
62-
"required": ["/**"]
64+
"required": ["/**"],
65+
"additionalProperties": false
6366
}

‎perception/autoware_object_merger/schema/overlapped_judge.schema.json

+26-7
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,45 @@
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"title": "Overlapped Judge Parameters",
44
"type": "object",
5-
"properties": {
6-
"ros__parameters": {
5+
"definitions": {
6+
"overlapped_judge": {
77
"type": "object",
88
"properties": {
99
"distance_threshold_list": {
1010
"type": "array",
1111
"items": {
1212
"type": "number"
1313
},
14-
"description": "Distance threshold for each class used in judging overlap."
14+
"description": "Distance threshold for each class used in judging overlap.",
15+
"default": [9.0, 9.0, 9.0, 9.0, 9.0, 9.0, 9.0, 9.0]
1516
},
1617
"generalized_iou_threshold": {
1718
"type": "array",
1819
"items": {
19-
"type": "number"
20+
"type": "number",
21+
"minimum": -1.0,
22+
"maximum": 1.0
2023
},
21-
"description": "Generalized IoU threshold for each class."
24+
"description": "Generalized IoU threshold for each class.",
25+
"default": [-0.1, -0.1, -0.1, -0.6, -0.6, -0.1, -0.1, -0.1]
26+
}
27+
},
28+
"required": ["distance_threshold_list", "generalized_iou_threshold"],
29+
"additionalProperties": false
30+
}
31+
},
32+
"properties": {
33+
"/**": {
34+
"type": "object",
35+
"properties": {
36+
"ros__parameters": {
37+
"$ref": "#/definitions/overlapped_judge"
2238
}
2339
},
24-
"required": ["distance_threshold_list", "generalized_iou_threshold"]
40+
"required": ["ros__parameters"],
41+
"additionalProperties": false
2542
}
26-
}
43+
},
44+
"required": ["/**"],
45+
"additionalProperties": false
2746
}

‎perception/autoware_occupancy_grid_map_outlier_filter/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The following video is a sample. Yellow points are high occupancy probability, g
4040

4141
## Parameters
4242

43-
{{ json_to_markdown("perception/occupancy_grid_map_outlier_filter/schema/occupancy_grid_map_outlier_filter.schema.json") }}
43+
{{ json_to_markdown("perception/autoware_occupancy_grid_map_outlier_filter/schema/occupancy_grid_map_outlier_filter.schema.json") }}
4444

4545
## Assumptions / Known limits
4646

‎perception/autoware_probabilistic_occupancy_grid_map/schema/synchronized_grid_map_fusion_node.schema.json

+99-91
Original file line numberDiff line numberDiff line change
@@ -2,104 +2,112 @@
22
"$schema": "http://json-schema.org/draft-07/schema#",
33
"title": "Parameters for Synchronized Grid Map Fusion Node",
44
"type": "object",
5+
"definitions": {
6+
"synchronized_grid_map_fusion": {
7+
"type": "object",
8+
"properties": {
9+
"fusion_input_ogm_topics": {
10+
"type": "array",
11+
"description": "List of fusion input occupancy grid map topics.",
12+
"items": {
13+
"type": "string"
14+
},
15+
"default": ["topic1", "topic2"]
16+
},
17+
"input_ogm_reliabilities": {
18+
"type": "array",
19+
"description": "Reliability of each sensor for fusion.",
20+
"items": {
21+
"type": "number",
22+
"minimum": 0.0,
23+
"maximum": 1.0
24+
},
25+
"default": [0.8, 0.2]
26+
},
27+
"fusion_method": {
28+
"type": "string",
29+
"description": "Method for occupancy grid map fusion.",
30+
"enum": ["overwrite", "log-odds", "dempster-shafer"],
31+
"default": "overwrite"
32+
},
33+
"match_threshold_sec": {
34+
"type": "number",
35+
"description": "Time threshold for matching in seconds.",
36+
"default": 0.01
37+
},
38+
"timeout_sec": {
39+
"type": "number",
40+
"description": "Timeout for synchronization in seconds.",
41+
"default": 0.1
42+
},
43+
"input_offset_sec": {
44+
"type": "array",
45+
"description": "Offset for each input in seconds.",
46+
"items": {
47+
"type": "number"
48+
},
49+
"default": [0.0, 0.0]
50+
},
51+
"map_frame_": {
52+
"type": "string",
53+
"description": "The frame ID of the map.",
54+
"default": "map"
55+
},
56+
"base_link_frame_": {
57+
"type": "string",
58+
"description": "The frame ID of the base link.",
59+
"default": "base_link"
60+
},
61+
"grid_map_origin_frame_": {
62+
"type": "string",
63+
"description": "The frame ID of the grid map origin.",
64+
"default": "base_link"
65+
},
66+
"fusion_map_length_x": {
67+
"type": "number",
68+
"description": "The length of the fusion map in the x direction.",
69+
"default": 100.0
70+
},
71+
"fusion_map_length_y": {
72+
"type": "number",
73+
"description": "The length of the fusion map in the y direction.",
74+
"default": 100.0
75+
},
76+
"fusion_map_resolution": {
77+
"type": "number",
78+
"description": "The resolution of the fusion map.",
79+
"default": 0.5
80+
}
81+
},
82+
"required": [
83+
"fusion_input_ogm_topics",
84+
"input_ogm_reliabilities",
85+
"fusion_method",
86+
"match_threshold_sec",
87+
"timeout_sec",
88+
"input_offset_sec",
89+
"map_frame_",
90+
"base_link_frame_",
91+
"grid_map_origin_frame_",
92+
"fusion_map_length_x",
93+
"fusion_map_length_y",
94+
"fusion_map_resolution"
95+
],
96+
"additionalProperties": false
97+
}
98+
},
599
"properties": {
6100
"/**": {
7101
"type": "object",
8102
"properties": {
9103
"ros__parameters": {
10-
"type": "object",
11-
"properties": {
12-
"fusion_input_ogm_topics": {
13-
"type": "array",
14-
"description": "List of fusion input occupancy grid map topics.",
15-
"items": {
16-
"type": "string"
17-
},
18-
"default": ["topic1", "topic2"]
19-
},
20-
"input_ogm_reliabilities": {
21-
"type": "array",
22-
"description": "Reliability of each sensor for fusion.",
23-
"items": {
24-
"type": "number",
25-
"minimum": 0.0,
26-
"maximum": 1.0
27-
},
28-
"default": [0.8, 0.2]
29-
},
30-
"fusion_method": {
31-
"type": "string",
32-
"description": "Method for occupancy grid map fusion.",
33-
"enum": ["overwrite", "log-odds", "dempster-shafer"],
34-
"default": "overwrite"
35-
},
36-
"match_threshold_sec": {
37-
"type": "number",
38-
"description": "Time threshold for matching in seconds.",
39-
"default": 0.01
40-
},
41-
"timeout_sec": {
42-
"type": "number",
43-
"description": "Timeout for synchronization in seconds.",
44-
"default": 0.1
45-
},
46-
"input_offset_sec": {
47-
"type": "array",
48-
"description": "Offset for each input in seconds.",
49-
"items": {
50-
"type": "number"
51-
},
52-
"default": [0.0, 0.0]
53-
},
54-
"map_frame_": {
55-
"type": "string",
56-
"description": "The frame ID of the map.",
57-
"default": "map"
58-
},
59-
"base_link_frame_": {
60-
"type": "string",
61-
"description": "The frame ID of the base link.",
62-
"default": "base_link"
63-
},
64-
"grid_map_origin_frame_": {
65-
"type": "string",
66-
"description": "The frame ID of the grid map origin.",
67-
"default": "base_link"
68-
},
69-
"fusion_map_length_x": {
70-
"type": "number",
71-
"description": "The length of the fusion map in the x direction.",
72-
"default": 100.0
73-
},
74-
"fusion_map_length_y": {
75-
"type": "number",
76-
"description": "The length of the fusion map in the y direction.",
77-
"default": 100.0
78-
},
79-
"fusion_map_resolution": {
80-
"type": "number",
81-
"description": "The resolution of the fusion map.",
82-
"default": 0.5
83-
}
84-
},
85-
"required": [
86-
"fusion_input_ogm_topics",
87-
"input_ogm_reliabilities",
88-
"fusion_method",
89-
"match_threshold_sec",
90-
"timeout_sec",
91-
"input_offset_sec",
92-
"map_frame_",
93-
"base_link_frame_",
94-
"grid_map_origin_frame_",
95-
"fusion_map_length_x",
96-
"fusion_map_length_y",
97-
"fusion_map_resolution"
98-
]
104+
"$ref": "#/definitions/synchronized_grid_map_fusion"
99105
}
100106
},
101-
"required": ["ros__parameters"]
107+
"required": ["ros__parameters"],
108+
"additionalProperties": false
102109
}
103110
},
104-
"required": ["/**"]
111+
"required": ["/**"],
112+
"additionalProperties": false
105113
}

0 commit comments

Comments
 (0)