Skip to content

Commit de59586

Browse files
bug fix of still executing error paths in a1 and a3
1 parent 231b21b commit de59586

2 files changed

Lines changed: 8 additions & 15 deletions

File tree

python/opss25/a1/ex4_basic_planner.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,8 @@ def naive_planner(domain: robotrunners, use_with_startkit: BindStartKit):
3636
def plan(
3737
env: MAPF.SharedEnvironment, paths: list[list], last_did_error: bool = False
3838
):
39-
#plan for all agents if any agent is unplanned
40-
if any(not p for p in paths):
41-
return [run_search(env, i) for i, _ in enumerate(paths)]
42-
else:
43-
return paths
39+
#plan for all agents
40+
return [run_search(env, i) for i, _ in enumerate(paths)]
4441

4542
return plan
4643

python/opss25/a3/ex3_reserved_planner_3d.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,10 @@ def plan(
2828
):
2929
#first clear the reservation table
3030
table.clear()
31-
if any(not p for p in paths):
32-
#plan for each agent
33-
for i in range(len(paths)):
34-
# plan path for agent i
35-
paths[i] = run_search(env, i)
36-
table.reserve(i, interop.get_agent_state(env, i), *paths[i])
37-
return paths
38-
else:
39-
return paths
40-
31+
#plan for each agent
32+
for i in range(len(paths)):
33+
# plan path for agent i
34+
paths[i] = run_search(env, i)
35+
table.reserve(i, interop.get_agent_state(env, i), *paths[i])
36+
return paths
4137
return plan

0 commit comments

Comments
 (0)