Refactor solver goal types and remove a use of PSQ. #4430
Merged
Conversation
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
This commit should have no effect on behavior. It splits the OpenGoal type into OpenGoal and PotentialGoal. Both types are only used when building the search tree. While PotentialGoal can represent any dependency or constraint, OpenGoal only represents dependencies that introduce goals (solver variables). Limiting OpenGoal to only represent goals simplifies the code. This commit also removes OpenGoal and FlaggedDep's 'comp' type variables. The two types had only been used with 'comp' equal to () or Component. Now FlaggedDep always uses Component, and OpenGoal does not need a Component.
This change will make it easier to replace PSQ with WeightedPSQ in solver GoalChoice nodes.
grayjay
force-pushed
the
solver-refactoring
branch
from
73377b1 to
bf551a7
Compare
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.
Two commits:
Refactor solver goal types.
This commit should have no effect on behavior. It splits the OpenGoal type into
OpenGoal and PotentialGoal. Both types are only used when building the search
tree. While PotentialGoal can represent any dependency or constraint, OpenGoal
only represents dependencies that introduce goals (solver variables). Limiting
OpenGoal to only represent goals simplifies the code.
This commit also removes OpenGoal and FlaggedDep's
comptype variables. Thetwo types had only been used with
compequal to () or Component. NowFlaggedDep always uses Component, and OpenGoal does not need a Component.
Replace a use of PSQ with [].
This change will make it easier to replace PSQ with WeightedPSQ in solver
GoalChoice nodes.
/cc @kosmikus