Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Follow up from #461.
The changes in #461 were needed to ensure the solution written was nonanticipative. However, as a side effect, it made the xhatters less effective. Because
XhatBase._try_one
did not restore the nonants, when the "next" scenario was called it would have the previous solution loaded, and not the PH iteration loaded. Therefore the incumbent finders were only producing at most one solution per PH iteration.This PR fixes the same bug as #461, but does so my moving the best solution found tracking code into
SPBase
. Then the Xhatters can update and cache the solution immediately after it is found, and then finally restoring the nonants for the next try. This also makes it much less likely that solutions found will be accidentally dropped because of a user configuration error.