Merge branch 'devel' of https://github.com/commaai/openpilot into devel-unsupported-cars

This commit is contained in:
dragonpilot
2019-09-16 13:56:56 +10:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ def calc_d_poly(l_poly, r_poly, p_poly, l_prob, r_prob, lane_width):
path_from_right_lane = r_poly.copy()
path_from_right_lane[3] += lane_width / 2.0
lr_prob = l_prob * r_prob
lr_prob = l_prob + r_prob - l_prob * r_prob
d_poly_lane = (l_prob * path_from_left_lane + r_prob * path_from_right_lane) / (l_prob + r_prob + 0.0001)
return lr_prob * d_poly_lane + (1.0 - lr_prob) * p_poly
@@ -1 +1 @@
8a11bcbc9833e154e10b59a8babb2b4545372f56
9124fa5837ead9b74d97aef85897478a5e8b92d2