Skip to content

Core: Speed up fill_restrictive item_pool pop loop #4536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 8, 2025
Merged

Core: Speed up fill_restrictive item_pool pop loop #4536

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b755759
Core: Speed up fill_restrictive item_pool pop loop
Mysteryem Jan 21, 2025
b2f5948
Fix comment typo
Mysteryem Jan 29, 2025
c5fdab0
Merge branch 'main' into fill_faster_item_pop_loop
Exempt-Medic Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Fill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,11 @@ def fill_restrictive(multiworld: MultiWorld, base_state: CollectionState, locati
items_to_place.append(reachable_items[next_player].pop())

for item in items_to_place:
for p, pool_item in enumerate(item_pool):
# The items added into `reachable_items` are placed starting from the end of each deque in
# `reachable_items`, so the items being placed are more likely to be found towards the end of `item_pool`.
for p, pool_item in enumerate(reversed(item_pool), start=1):
if pool_item is item:
item_pool.pop(p)
del item_pool[-p]
break

maximum_exploration_state = sweep_from_pool(
Expand Down
Loading