refactor(pumpkin-solver): Use the fzn-rs package instead of flatzinc#258
Open
maartenflippo wants to merge 115 commits intomainfrom
Open
refactor(pumpkin-solver): Use the fzn-rs package instead of flatzinc#258maartenflippo wants to merge 115 commits intomainfrom
fzn-rs package instead of flatzinc#258maartenflippo wants to merge 115 commits intomainfrom
Conversation
…he solve item in TypedInstance
maartenflippo
force-pushed
the
feat/improved-fzn-parser
branch
from
945b37e to
438aa3b
Compare
maartenflippo
force-pushed
the
feat/pumpkin-use-fzn-rs
branch
from
898a593 to
244b353
Compare
The Rc is not Send, but popular crates like anyhow do expect errors to be Send. Since these are errors, we pay the price to allocate a String instead.
… fzn-rs" This reverts commit 8c5b945.
github-actions
bot
dismissed stale reviews from ImkoMarijnissen and ImkoMarijnissen
Review re-requested
Contributor
|
let mut typed_ast |
maartenflippo
force-pushed
the
feat/improved-fzn-parser
branch
from
cfe2685 to
1ee9455
Compare
ImkoMarijnissen
requested changes
Nov 26, 2025
Contributor
ImkoMarijnissen
left a comment
ImkoMarijnissen
left a comment
There was a problem hiding this comment.
Only went through the changes in pumpkin-solver
| } | ||
|
|
||
| ast::Domain::UnboundedInt => { | ||
| return Err(FlatZincError::UnsupportedVariable(name.as_ref().into())) |
Contributor
There was a problem hiding this comment.
We now "support" this
Comment on lines
+42
to
+45
| // A literal which is always true, can be used when using bool constants in the solver | ||
| // pub(crate) constant_bool_true: BooleanDomainId, | ||
| // A literal which is always false, can be used when using bool constants in the solver | ||
| // pub(crate) constant_bool_false: BooleanDomainId, |
Contributor
There was a problem hiding this comment.
This commented out code can be removed
| instance | ||
| .resolve_array(array) | ||
| .map_err(|err| FlatZincError::UndefinedArray(err.0))? | ||
| .map(|maybe_int| maybe_int.map_err(FlatZincError::from)) |
Contributor
There was a problem hiding this comment.
To me this is a bit vague; why could this be an int?
Contributor
There was a problem hiding this comment.
Other compiler files have some documentation using //! that specifies the overall purpose of the file; would be nice to include that here as well
| instance: &Instance, | ||
| context: &mut CompilationContext, | ||
| ) -> Result<(), FlatZincError> { | ||
| for (name, array) in &instance.arrays { |
Contributor
There was a problem hiding this comment.
Is this something that we previously did not support or did we just handle it in a different way previously?
Comment on lines
+87
to
+88
| ast::Domain::UnboundedInt => { | ||
| return Err(FlatZincError::UnsupportedVariable(name.as_ref().into())) |
Contributor
There was a problem hiding this comment.
Not unsupported anymore
maartenflippo
force-pushed
the
feat/improved-fzn-parser
branch
from
1ee9455 to
7d97aaf
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
3 participants
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.
We migrate to the
fzn-rspackage, which extracts much of the parsing of flatzinc files to a separate crate.Todo
fzn-rs, a better FlatZinc parser that is easier to re-use across projects #238main