Skip to content
Snippets Groups Projects
Commit 5b5ff222 authored by rachelmoan's avatar rachelmoan
Browse files

remove some unused code

parent c29ee9be
No related branches found
No related tags found
No related merge requests found
......@@ -85,7 +85,7 @@ class GuidedMRMP:
return trajectory
def find_all_conflicts(self, desired_controls, desired_trajs, dt):
def find_all_conflicts(self, desired_trajs, dt):
"""
Check for any conflicts that will occur between robots in the next time horizon
"""
......@@ -174,8 +174,8 @@ class GuidedMRMP:
# get the next control for each robot
next_desired_controls, trajectories = self.get_next_controls_and_trajectories(screen)
# find all the conflicts at the next timestep
conflicts = self.find_all_conflicts(next_desired_controls, trajectories, dt)
# find all the conflicts at the next time horizon
conflicts = self.find_all_conflicts(trajectories, dt)
# resolve the conflicts using the database
# resolver = TrajOptDBResolver(10, 60, conflicts, self.robots)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment