feat(solver)!: Solve for optional solvables in addition to the root solvable #54
Conversation
This file contains 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
eviltak
force-pushed
the
solve-for-optional-solvables
branch
from
fabe12e to
5f2e596
Compare
eviltak
force-pushed
the
solve-for-optional-solvables
branch
from
42beae0 to
adc770e
Compare
|
Sorry, Im a bit busy with other things atm! Will get back to this PR as soon as I can. |
baszalmstra
requested changes
Jul 29, 2024
eviltak
force-pushed
the
solve-for-optional-solvables
branch
from
adc770e to
97f69da
Compare
eviltak
changed the title
eviltak
force-pushed
the
solve-for-optional-solvables
branch
from
9d8d069 to
e46328a
Compare
baszalmstra
approved these changes
Aug 5, 2024
The requirement of ensuring that no decisions are made for any candidate before the clauses for a package are added is unnecessary, since we now perform propagation every time after adding any new clauses.
|
I'll do this in the next few hours, so it should be ready for you to merge tomorrow. Thanks for your help! |
eviltak
force-pushed
the
solve-for-optional-solvables
branch
2 times, most recently
from
9de74c9 to
f3f886d
Compare
|
Rebased onto |
|
Thank you! |
Merged
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.
Adds a new
Solver::solve_with_additionalmethod, that solves for the providedroot_requirementsandroot_constraints, along with a set of additional (optional) solvables. Unless the corresponding package has been requested by a version set in another solvable's clauses, each additional solvable is not subject to the package-level clauses introduced inDependencyProvider::get_candidatessince the solvables have been requested specifically (and not through a version set).This feature is useful for situations where you want to ensure that particular solvables (for example, previously installed solvables) are compatible with the solution to the root requirements and constraints.
The implementation is facilitated by making the
run_satmethod solve for arbitrary solvables at arbitrary levels, not just the root solvable. This allows the solver to solve for the additional solvables after solving for the root solvable while taking into account the clauses and decisions introduced in the solving process.Breaking changes
problemmodule and its container structs toconflict, since they are used to inspect an unsatisfiable conflictsolver::Problemstruct as an input for theSolver::solvemethod to allow for flexibility in solver input argumentsExisting users will have to change the code that calls
Solver::solveto pass in an instance of theProblemstruct rather than passing in theroot_requirementsandroot_constraintsdirectly as arguments to the method.