Fix GCC solution loss during recomputation#226
Merged
Conversation
8582771 to
5bc62fb
Compare
5bc62fb to
b5c2782
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Domain-level global cardinality propagation could lose solutions in two related matching-state paths.
First, assigned variables were counted in both the upper- and lower-bound narrowing passes when recomputation replayed several choices before propagation. Second, when a variable cardinality maximum shrank by more than the number of currently matched edges, the propagator retained an impossible conflict count. That stale conflict mark could remove supported value edges.
Count assigned variables only in the upper-bound pass, and cap conflict bookkeeping by the number of genuinely matched edges (excluding already-counted assigned occurrences). This retains the existing rematching strength without leaving stale conflicts.
The FlatZinc regression now covers both the original deterministic issue model (26 solutions, including a formerly missing assignment) and the minimized random-search model (11 solutions, including its formerly missing assignment).
Verified with:
Closes #166.