-
Notifications
You must be signed in to change notification settings - Fork 722
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.
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
Fill: fix swap error found in CI #2397
Fill: fix swap error found in CI #2397
Conversation
Swap now assumes the unplaced items can be placed before the to-be-swapped item. Unsure if that is safe or unsafe.
I thought the remaining item pool is already in state, since in reverse fill they're yet to be placed into earlier spheres. IF the bug was just that it wasn't correctly in swap state, then this should be safe. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So approving that if the above theory is correct, this should be good. But this is one where people testing it would be nice.
The assumption that it can place all of item_pool before the to-be-swapped-out item may not be true. While this is fine for the reverse fill, because it'll swap later, I'm not sure that's always fine for swap, because swap is what should "fix" it. Testing/comparing failures would be good and if we find issues with this, we can filter item_pool based on reachable locations with the old swap_state (i.e. sweep without item_pool). Something like |
Comparing my old set of yamls, I get {
"success": {
"github.com_ArchipelagoMW-Archipe_main/venv": 4920,
"github.com_black-sliver-Archipelago_fill-swap-fix-2/venv": 4921
},
"failed": {
"github.com_ArchipelagoMW-Archipe_main/venv": 80,
"github.com_black-sliver-Archipelago_fill-swap-fix-2/venv": 79
}
} Mixing the SM64EX yaml that fails every other seed with others, I see a real improvement: {
"success": {
"github.com_ArchipelagoMW-Archipe_main/venv": 1236,
"github.com_black-sliver-Archipelago_fill-swap-fix-2/venv": 1295
},
"failed": {
"github.com_ArchipelagoMW-Archipe_main/venv": 164,
"github.com_black-sliver-Archipelago_fill-swap-fix-2/venv": 105
}
} The failing yaml itself is not fixed by this though, only when combined with others. |
* Fill: add test for swap error with item rules https://discord.com/channels/731205301247803413/731214280439103580/1167195750082560121 * Fill: fix swap error found in CI Swap now assumes the unplaced items can be placed before the to-be-swapped item. Unsure if that is safe or unsafe. * Test: clarify docstring and comments in fill swap test * Test: clarify comments in fill swap test more
* Fill: add test for swap error with item rules https://discord.com/channels/731205301247803413/731214280439103580/1167195750082560121 * Fill: fix swap error found in CI Swap now assumes the unplaced items can be placed before the to-be-swapped item. Unsure if that is safe or unsafe. * Test: clarify docstring and comments in fill swap test * Test: clarify comments in fill swap test more
https://discord.com/channels/731205301247803413/731214280439103580/1167195750082560121
Swap now assumes the unplaced items can be placed before the to-be-swapped item.
Unsure if that is safe or unsafe.