Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
139 changes: 70 additions & 69 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ authors = [
"Konstantin Sidorov",
"Jeff Smits"
] # Ordered alphabetically based on last name!
version = "0.5.0"
version = "0.6.0"

[patch.crates-io]
fnv = { git = "https://github.com/servo/rust-fnv", branch = "main" }
Expand Down
2 changes: 1 addition & 1 deletion fzn-rs-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fzn-rs-derive"
version = "0.1.2"
version = "0.1.3"
description = "Derive macros for fzn-rs."
repository.workspace = true
edition.workspace = true
Expand Down
6 changes: 6 additions & 0 deletions fzn-rs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [0.1.3](https://github.com/ConSol-Lab/Pumpkin/compare/fzn-rs-v0.1.2...fzn-rs-v0.1.3) - 2026-10-22

### Other

- *(deps)* bump convert_case from 0.11.0 to 0.12.0 ([#560](https://github.com/ConSol-Lab/Pumpkin/pull/560))

## [0.1.2](https://github.com/ConSol-Lab/Pumpkin/compare/fzn-rs-v0.1.1...fzn-rs-v0.1.2) - 2026-08-05

### Other
Expand Down
4 changes: 2 additions & 2 deletions fzn-rs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "fzn-rs"
version = "0.1.2"
version = "0.1.3"
description = "A FlatZinc parser written in Rust."
repository.workspace = true
edition.workspace = true
Expand All @@ -10,7 +10,7 @@ authors.workspace = true
[dependencies]
chumsky = { version = "0.13.0" }
thiserror = "2.0.12"
fzn-rs-derive = { version = "0.1.2", path = "../fzn-rs-derive/" }
fzn-rs-derive = { version = "0.1.3", path = "../fzn-rs-derive/" }

[lints]
workspace = true
6 changes: 6 additions & 0 deletions pumpkin-checker/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).


## [0.6.0](https://github.com/ConSol-Lab/Pumpkin/compare/pumpkin-checker-v0.5.0...pumpkin-checker-v0.6.0) - 2026-10-22

### Other

- update Cargo.lock dependencies

## [0.5.0](https://github.com/ConSol-Lab/Pumpkin/compare/pumpkin-checker-v0.4.0...pumpkin-checker-v0.5.0) - 2026-08-05

### Fixed
Expand Down
8 changes: 4 additions & 4 deletions pumpkin-checker/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ exclude = [
]

[dependencies]
pumpkin-core = { version = "0.5.0", path = "../pumpkin-crates/core/" }
pumpkin-checking = { version = "0.5.0", path = "../pumpkin-crates/checking/" }
pumpkin-propagators = { version = "0.5.0", path = "../pumpkin-crates/propagators/" }
pumpkin-core = { version = "0.6.0", path = "../pumpkin-crates/core/" }
pumpkin-checking = { version = "0.6.0", path = "../pumpkin-crates/checking/" }
pumpkin-propagators = { version = "0.6.0", path = "../pumpkin-crates/propagators/" }
anyhow = "1.0.99"
clap = { version = "4.5.47", features = ["derive"] }
drcp-format = { version = "0.3.1", path = "../drcp-format" }
flate2 = "1.1.2"
fzn-rs = { version = "0.1.2", path = "../fzn-rs" }
fzn-rs = { version = "0.1.3", path = "../fzn-rs" }
thiserror = "2.0.16"
fnv = "1.0.7"
derive_more = { version = "2.1.1", features = ["from"] }
Expand Down
2 changes: 1 addition & 1 deletion pumpkin-crates/branching/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ workspace = true
[dependencies]
enum-map = "3.1.0"
log = "0.4.30"
pumpkin-core = { version = "0.5.0", path = "../core" }
pumpkin-core = { version = "0.6.0", path = "../core" }
2 changes: 1 addition & 1 deletion pumpkin-crates/conflict-resolvers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ workspace = true
[dependencies]
itertools = "0.15.0"
log = "0.4.27"
pumpkin-core = { version = "0.5.0", path = "../core" }
pumpkin-core = { version = "0.6.0", path = "../core" }
4 changes: 2 additions & 2 deletions pumpkin-crates/constraints/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ description = "The constraints of the Pumpkin constraint programming solver."
workspace = true

[dependencies]
pumpkin-core = { version = "0.5.0", path = "../core" }
pumpkin-propagators = { version = "0.5.0", path="../propagators"}
pumpkin-core = { version = "0.6.0", path = "../core" }
pumpkin-propagators = { version = "0.6.0", path="../propagators"}

[features]
clap = ["pumpkin-core/clap", "pumpkin-propagators/clap"]
2 changes: 1 addition & 1 deletion pumpkin-crates/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ description = "The core of the Pumpkin constraint programming solver."
workspace = true

[dependencies]
pumpkin-checking = { version = "0.5.0", path = "../checking" }
pumpkin-checking = { version = "0.6.0", path = "../checking" }
thiserror = "2.0.12"
log = "0.4.30"
enumset = "1.1.13"
Expand Down
4 changes: 2 additions & 2 deletions pumpkin-crates/propagators/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ description = "The propagators of the Pumpkin constraint programming solver."
workspace = true

[dependencies]
pumpkin-core = { version = "0.5.0", path = "../core" }
pumpkin-checking = { version = "0.5.0", path = "../checking" }
pumpkin-core = { version = "0.6.0", path = "../core" }
pumpkin-checking = { version = "0.6.0", path = "../checking" }
enumset = "1.1.13"
bitfield-struct = "0.13.0"
convert_case = "0.12.0"
Expand Down
8 changes: 4 additions & 4 deletions pumpkin-proof-processor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ anyhow = "1.0.99"
clap = { version = "4.5.47", features = ["derive"] }
clap-verbosity-flag = "3.0.4"
drcp-format = { version = "0.3.1", path = "../drcp-format" }
fzn-rs = { version = "0.1.2", path = "../fzn-rs" }
fzn-rs = { version = "0.1.3", path = "../fzn-rs" }
flate2 = { version = "1.1.2" }
env_logger = "0.11.10"
pumpkin-checking = { version = "0.5.0", path = "../pumpkin-crates/checking" }
pumpkin-core = { version = "0.5.0", path = "../pumpkin-crates/core" }
pumpkin-propagators = { version = "0.5.0", path = "../pumpkin-crates/propagators" }
pumpkin-checking = { version = "0.6.0", path = "../pumpkin-crates/checking" }
pumpkin-core = { version = "0.6.0", path = "../pumpkin-crates/core" }
pumpkin-propagators = { version = "0.6.0", path = "../pumpkin-crates/propagators" }
log = "0.4.30"
thiserror = "2.0.18"

Expand Down
8 changes: 4 additions & 4 deletions pumpkin-solver-py/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ doc = false

[dependencies]
pyo3 = { version = "0.30.1", features= ["extension-module"] }
pumpkin-solver = { version = "0.5.0", path = "../pumpkin-solver" }
pumpkin-constraints = { version = "0.5.0", path = "../pumpkin-crates/constraints", features=["clap"] }
pumpkin-conflict-resolvers = { version = "0.5.0", path = "../pumpkin-crates/conflict-resolvers/"}
pumpkin-branching = { version = "0.5.0", path = "../pumpkin-crates/branching/"}
pumpkin-solver = { version = "0.6.0", path = "../pumpkin-solver" }
pumpkin-constraints = { version = "0.6.0", path = "../pumpkin-crates/constraints", features=["clap"] }
pumpkin-conflict-resolvers = { version = "0.6.0", path = "../pumpkin-crates/conflict-resolvers/"}
pumpkin-branching = { version = "0.6.0", path = "../pumpkin-crates/branching/"}

[build-dependencies]
pyo3-build-config = "0.30.1"
41 changes: 41 additions & 0 deletions pumpkin-solver/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,47 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.6.0](https://github.com/ConSol-Lab/Pumpkin/compare/pumpkin-solver-v0.5.0...pumpkin-solver-v0.6.0) - 2026-10-22

### Added

- *(pumpkin-solver)* Automatically generate `.msc` files ([#616](https://github.com/ConSol-Lab/Pumpkin/pull/616))
- *(pumpkin-solver)* Add pumpkin-checking to export of pumpkin-solver ([#563](https://github.com/ConSol-Lab/Pumpkin/pull/563))
- *(pumpkin-core)* Improve memory usage of predicate notification system ([#590](https://github.com/ConSol-Lab/Pumpkin/pull/590))
- *(pumpkin-proof-processor)* Minimising number of deductions in trimmed proof by giving marked deductions higher propagation priority ([#523](https://github.com/ConSol-Lab/Pumpkin/pull/523))

### Fixed

- *(pumpkin-core)* Watchers not properly set when `check-propagations` is on ([#587](https://github.com/ConSol-Lab/Pumpkin/pull/587))
- *(pumpkin-core)* Do not ignore reification literals in the proof ([#586](https://github.com/ConSol-Lab/Pumpkin/pull/586))
- *(pumpkin-core)* Underflow in restoring to current decision level ([#592](https://github.com/ConSol-Lab/Pumpkin/pull/592))
- *(pumpkin-core)* Update last-traversed in nogood propagator ([#576](https://github.com/ConSol-Lab/Pumpkin/pull/576))
- *(pumpkin-propagators)* Synchronisation of time-tabling due to differences in enqueueing ([#545](https://github.com/ConSol-Lab/Pumpkin/pull/545))
- *(pumpkin-propagators)* Off-by-one error when checking between profiles in time-tabling ([#621](https://github.com/ConSol-Lab/Pumpkin/pull/621))
- *(pumpkin-propagators)* Remove the explanation cache from time-table propagator to avoid incorrect explanations ([#620](https://github.com/ConSol-Lab/Pumpkin/pull/620))
- *(pumpkin-propagators)* Time-table propagator incorrectly not recomputing time-table ([#619](https://github.com/ConSol-Lab/Pumpkin/pull/619))
- *(pumpkin-propagators)* Disregard zero duration tasks in `Cumulative` ([#579](https://github.com/ConSol-Lab/Pumpkin/pull/579))

### Other

- *(pumpkin-core)* Extracting branchers as separate crate ([#562](https://github.com/ConSol-Lab/Pumpkin/pull/562))
- Update README.md badges ([#593](https://github.com/ConSol-Lab/Pumpkin/pull/593))
- Mutable references that are unused are now warnings ([#570](https://github.com/ConSol-Lab/Pumpkin/pull/570))
- *(deps)* bump stringcase from 0.4.0 to 1.0.0 ([#556](https://github.com/ConSol-Lab/Pumpkin/pull/556))
- *(pumpkin-core)* Do not store inference checker when it is not used ([#591](https://github.com/ConSol-Lab/Pumpkin/pull/591))
- *(pumpkin-core)* Remove unused `permanent_nogood_ids` ([#589](https://github.com/ConSol-Lab/Pumpkin/pull/589))
- Inherit lints in `pumpkin-solver-py` + fix clippy and deny lints ([#585](https://github.com/ConSol-Lab/Pumpkin/pull/585))
- *(pumpkin-core)* Avoid unnecessary allocations ([#573](https://github.com/ConSol-Lab/Pumpkin/pull/573))
- *(deps)* bump convert_case from 0.11.0 to 0.12.0 ([#560](https://github.com/ConSol-Lab/Pumpkin/pull/560))
- *(pumpkin-conflict-resolvers)* Make iterative minimisation incremental ([#588](https://github.com/ConSol-Lab/Pumpkin/pull/588))
- *(pumpkin-conflict-resolvers)* Avoid unnecessarily retrieving PredicateId twice ([#574](https://github.com/ConSol-Lab/Pumpkin/pull/574))
- Fix mutable borrow clippy warnings ([#572](https://github.com/ConSol-Lab/Pumpkin/pull/572))
- *(deps)* bump pyo3 from 0.29.1 to 0.29.2 ([#551](https://github.com/ConSol-Lab/Pumpkin/pull/551))
- *(pumpkin-conflict-resolvers)* Remove incorrect check ([#544](https://github.com/ConSol-Lab/Pumpkin/pull/544))
- *(pumpkin-propagators)* Unify the time-table test suite into a single one ([#600](https://github.com/ConSol-Lab/Pumpkin/pull/600))
- *(deps)* bump cc from 1.5.1 to 1.6.0 ([#602](https://github.com/ConSol-Lab/Pumpkin/pull/602))
- *(pumpkin-propagators)* Simplify conflict detection incremental updates ([#543](https://github.com/ConSol-Lab/Pumpkin/pull/543))

## [0.5.0](https://github.com/ConSol-Lab/Pumpkin/compare/pumpkin-solver-v0.4.0...pumpkin-solver-v0.5.0) - 2026-08-05

### Added
Expand Down
12 changes: 6 additions & 6 deletions pumpkin-solver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ clap = { version = "4.5.17", features = ["derive"] }
env_logger = "0.11.10"
flatzinc = "0.3.21"
log = "0.4.30"
pumpkin-core = { version = "0.5.0", path = "../pumpkin-crates/core/", features = ["clap"] }
pumpkin-constraints = { version = "0.5.0", path = "../pumpkin-crates/constraints/"}
pumpkin-propagators = { version = "0.5.0", path = "../pumpkin-crates/propagators/", features=["clap"]}
pumpkin-conflict-resolvers = { version = "0.5.0", path = "../pumpkin-crates/conflict-resolvers/"}
pumpkin-branching = { version = "0.5.0", path = "../pumpkin-crates/branching/"}
pumpkin-checking = { version = "0.5.0", path = "../pumpkin-crates/checking/"}
pumpkin-core = { version = "0.6.0", path = "../pumpkin-crates/core/", features = ["clap"] }
pumpkin-constraints = { version = "0.6.0", path = "../pumpkin-crates/constraints/"}
pumpkin-propagators = { version = "0.6.0", path = "../pumpkin-crates/propagators/", features=["clap"]}
pumpkin-conflict-resolvers = { version = "0.6.0", path = "../pumpkin-crates/conflict-resolvers/"}
pumpkin-branching = { version = "0.6.0", path = "../pumpkin-crates/branching/"}
pumpkin-checking = { version = "0.6.0", path = "../pumpkin-crates/checking/"}
serde_json = { version = "1.0.151", features = ["preserve_order"] }
signal-hook = "0.4.4"
thiserror = "2.0.12"
Expand Down