Skip to content

Commit 2fc10e8

Browse files
authored
Maneuver: log drel and use it in tuning report (#37033)
1 parent bf8cae5 commit 2fc10e8

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

selfdrive/test/longitudinal_maneuvers/maneuver.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ def evaluate(self):
6060
log['distance_lead'],
6161
log['speed'],
6262
speed_lead,
63-
log['acceleration']]))
63+
log['acceleration'],
64+
log['d_rel']]))
6465

6566
if d_rel < .4 and (self.only_radar or prob_lead > 0.5):
6667
print("Crashed!!!!")

tools/longitudinal_maneuvers/mpc_longitudinal_tuning_report.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,18 @@
77
from openpilot.selfdrive.controls.tests.test_following_distance import desired_follow_distance
88

99
TIME = 0
10+
LEAD_DISTANCE= 2
1011
EGO_V = 3
1112
EGO_A = 5
12-
LEAD_DISTANCE= 2
13+
D_REL = 6
1314

1415
axis_labels = ['Time (s)',
1516
'Ego position (m)',
16-
'Lead distance (m)',
17+
'Lead absolute position (m)',
1718
'Ego Velocity (m/s)',
1819
'Lead Velocity (m/s)',
1920
'Ego acceleration (m/s^2)',
21+
'Lead distance (m)'
2022
]
2123

2224

@@ -81,7 +83,7 @@ def get_html_from_results(results, labels, AXIS):
8183

8284
htmls.append(markdown.markdown('# ' + name))
8385
htmls.append(get_html_from_results(results, labels, EGO_A))
84-
htmls.append(get_html_from_results(results, labels, LEAD_DISTANCE))
86+
htmls.append(get_html_from_results(results, labels, D_REL))
8587

8688

8789
results = {}
@@ -102,6 +104,7 @@ def get_html_from_results(results, labels, AXIS):
102104
labels.append(f'{oscil} m/s oscilliation size')
103105

104106
htmls.append(markdown.markdown('# ' + name))
107+
htmls.append(get_html_from_results(results, labels, D_REL))
105108
htmls.append(get_html_from_results(results, labels, EGO_V))
106109
htmls.append(get_html_from_results(results, labels, EGO_A))
107110

@@ -126,7 +129,7 @@ def get_html_from_results(results, labels, AXIS):
126129

127130
htmls.append(markdown.markdown('# ' + name))
128131
htmls.append(get_html_from_results(results, labels, EGO_V))
129-
htmls.append(get_html_from_results(results, labels, LEAD_DISTANCE))
132+
htmls.append(get_html_from_results(results, labels, D_REL))
130133

131134

132135
results = {}
@@ -148,7 +151,7 @@ def get_html_from_results(results, labels, AXIS):
148151

149152
htmls.append(markdown.markdown('# ' + name))
150153
htmls.append(get_html_from_results(results, labels, EGO_V))
151-
htmls.append(get_html_from_results(results, labels, LEAD_DISTANCE))
154+
htmls.append(get_html_from_results(results, labels, D_REL))
152155

153156

154157
results = {}
@@ -170,7 +173,7 @@ def get_html_from_results(results, labels, AXIS):
170173

171174
htmls.append(markdown.markdown('# ' + name))
172175
htmls.append(get_html_from_results(results, labels, EGO_A))
173-
htmls.append(get_html_from_results(results, labels, LEAD_DISTANCE))
176+
htmls.append(get_html_from_results(results, labels, D_REL))
174177

175178

176179
results = {}
@@ -193,7 +196,7 @@ def get_html_from_results(results, labels, AXIS):
193196

194197
htmls.append(markdown.markdown('# ' + name))
195198
htmls.append(get_html_from_results(results, labels, EGO_A))
196-
htmls.append(get_html_from_results(results, labels, LEAD_DISTANCE))
199+
htmls.append(get_html_from_results(results, labels, D_REL))
197200

198201

199202
results = {}

0 commit comments

Comments
 (0)