FixedShapedSolver #29
Merged
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
…h_with_hole`, and `_rulenode_match` with `pattern_match`
… the `FixedShapedSolver`
…raint, StateInt}` datastructure to check for constraint activation
…vation. From now on, constraints are repropagated by default. Satisfied constraints are responsible for calling `deactivate`.
|
When runnning the tests, I get |
|
We agreed to merge for now, as everything seems to work fine and tests are very thorough. I'll try to do a more in-depth review of the 4500 added lines during the Hackathon. |
THinnerichs
reviewed
Apr 4, 2024
| @@ -38,7 +38,7 @@ end | |||
| ``` | |||
| """ | |||
| macro csgrammar_annotated(expression) | |||
THinnerichs
reviewed
Apr 4, 2024
| Contains <: GrammarConstraint | ||
| This [`GrammarConstraint`] enforces that a given `rule` appears in the program tree at least once. | ||
| """ | ||
| struct Contains <: GrammarConstraint |
There was a problem hiding this comment.
Contains is a verb and should hence not be used as a struct name; also not very descriptive. Better use ContainsConstraint
| Therefore, [`Forbidden`](@ref) can only be used in implementations that keep track of the | ||
| [`LocalConstraint`](@ref)s and propagate them at the right moments. | ||
| """ | ||
| struct Forbidden <: GrammarConstraint |
There was a problem hiding this comment.
Name is a Verb, hence sub-optimal for struct name. Better use ForbiddenConstraint
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 two types of solvers:
FixedShapedSolver. This solver is more memory efficient, but only works on fixed shaped trees. It enumerates all solutions of a fixed shaped tree by (re)assigning the values of holes. To achieve this, it uses a new fixed shaped hole type with stateful domains.GenericSolver. This solver has more flexible state management. It treats each state as an independent propagation program. Iterators can usesave_state!andload_state!to switch between states at any time.