Skip to content

Commit 998f75e

Browse files
committed
Modified to load param in a planner
1 parent 41e46df commit 998f75e

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

GEMstack/onboard/planning/longitudinal_planning.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,9 +1003,6 @@ def update(self, state : AllState):
10031003

10041004
route_to_end = route.trim(closest_parameter, len(route.points) - 1)
10051005

1006-
print("ROUTE_WITH_LOOKAHEAD", route_with_lookahead)
1007-
print("ROUTE_TO_END", route_to_end)
1008-
10091006
should_yield = False
10101007
yield_deceleration = 0.0
10111008

@@ -1404,17 +1401,17 @@ def update(self, state : AllState):
14041401

14051402
# #choose whether to accelerate, brake, or keep at current velocity
14061403
# if should_accelerate:
1407-
# traj = longitudinal_plan(route_with_lookahead, self.acceleration, self.deceleration, self.desired_speed, curr_v, "milestone")
1404+
# traj = longitudinal_plan(route_with_lookahead, self.acceleration, self.deceleration, self.desired_speed, curr_v, self.planner)
14081405
# elif should_yield:
14091406
# desired_speed = math.sqrt(-2 * yield_deceleration * r_pedestrain_x + curr_v**2)
14101407
# desired_speed = max(desired_speed, 0)
14111408
# # traj = longitudinal_brake(route_with_lookahead, yield_deceleration, curr_v)
14121409
# if desired_speed > 0:
1413-
# traj = longitudinal_plan(route_with_lookahead, 0, yield_deceleration, desired_speed, curr_v, "dt")
1410+
# traj = longitudinal_plan(route_with_lookahead, 0, yield_deceleration, desired_speed, curr_v, self.planner)
14141411
# else:
14151412
# traj = longitudinal_brake(route_with_lookahead, yield_deceleration, curr_v)
14161413
# else:
1417-
# traj = longitudinal_plan(route_with_lookahead, 0.0, self.deceleration, self.desired_speed, curr_v, "dt")
1414+
# traj = longitudinal_plan(route_with_lookahead, 0.0, self.deceleration, self.desired_speed, curr_v, self.planner)
14181415

14191416
# return traj
14201417

0 commit comments

Comments
 (0)