diff --git a/uc-deliveries/Cargo.lock b/uc-deliveries/Cargo.lock index 706363d..98c1534 100644 --- a/uc-deliveries/Cargo.lock +++ b/uc-deliveries/Cargo.lock @@ -1497,9 +1497,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -1512,9 +1512,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -1523,9 +1523,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -1535,9 +1535,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -1545,9 +1545,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -1574,9 +1574,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -1600,18 +1600,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand 0.10.1", "rayon", diff --git a/uc-deliveries/Cargo.toml b/uc-deliveries/Cargo.toml index 2b3189e..d595274 100644 --- a/uc-deliveries/Cargo.toml +++ b/uc-deliveries/Cargo.toml @@ -11,7 +11,7 @@ name = "solverforge_deliveries" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = [ +solverforge = { version = "0.25.1", features = [ "serde", "console", "verbose-logging", diff --git a/uc-deliveries/README.md b/uc-deliveries/README.md index ba237ed..00f0417 100644 --- a/uc-deliveries/README.md +++ b/uc-deliveries/README.md @@ -54,7 +54,7 @@ make help - Package: `solverforge-deliveries`; version is declared in `Cargo.toml` - Release binary: `solverforge_deliveries` - Rust: `1.95` -- SolverForge runtime: `solverforge` `0.25.0` +- SolverForge runtime: `solverforge` `0.25.1` - Browser UI assets: `solverforge-ui` `0.9.0` - Routing engine: `solverforge-maps` `2.1.5` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` diff --git a/uc-deliveries/WIREFRAME.md b/uc-deliveries/WIREFRAME.md index a02c283..97198f8 100644 --- a/uc-deliveries/WIREFRAME.md +++ b/uc-deliveries/WIREFRAME.md @@ -92,7 +92,7 @@ It shows how to combine: │ Embedded search policy for construction heuristics and local search. ├── solverforge.app.toml │ App metadata, demo IDs, model facts/entities, registry dependency sources, -│ and the `solverforge 0.25.0` runtime target. +│ and the `solverforge 0.25.1` runtime target. ├── Makefile │ Local build, validation, live-road, and Space/Docker commands. ├── Dockerfile diff --git a/uc-deliveries/solverforge.app.toml b/uc-deliveries/solverforge.app.toml index 29444b4..6033ec8 100644 --- a/uc-deliveries/solverforge.app.toml +++ b/uc-deliveries/solverforge.app.toml @@ -5,8 +5,8 @@ cli_version = "2.2.2" shell = "web" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-deliveries/src/constraints/assemble.rs b/uc-deliveries/src/constraints/assemble.rs new file mode 100644 index 0000000..fc2338d --- /dev/null +++ b/uc-deliveries/src/constraints/assemble.rs @@ -0,0 +1,16 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +/// Collects the full scoring model used by `Plan`. +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::all_deliveries_assigned::constraint(), + super::vehicle_capacity::constraint(), + super::delivery_time_windows::constraint(), + super::total_travel_time::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-deliveries/src/constraints/mod.rs b/uc-deliveries/src/constraints/mod.rs index f66862e..e3697e3 100644 --- a/uc-deliveries/src/constraints/mod.rs +++ b/uc-deliveries/src/constraints/mod.rs @@ -1,33 +1,15 @@ -#![cfg_attr(rustfmt, rustfmt_skip)] //! Constraint assembly for delivery routing. //! //! Each sibling file contributes one named rule. `create_constraints()` lists //! them in the order we want beginners to see in score analysis output. -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules mod all_deliveries_assigned; -mod vehicle_capacity; mod delivery_time_windows; mod total_travel_time; +mod vehicle_capacity; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; - /// Collects the full scoring model used by `Plan`. - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - all_deliveries_assigned::constraint(), - vehicle_capacity::constraint(), - delivery_time_windows::constraint(), - total_travel_time::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints; diff --git a/uc-fleet/Cargo.lock b/uc-fleet/Cargo.lock index 5ca4eac..c82919e 100644 --- a/uc-fleet/Cargo.lock +++ b/uc-fleet/Cargo.lock @@ -728,9 +728,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -743,9 +743,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -754,9 +754,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -766,9 +766,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -776,9 +776,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -804,9 +804,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -815,18 +815,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-fleet/Cargo.toml b/uc-fleet/Cargo.toml index f48f115..30d628b 100644 --- a/uc-fleet/Cargo.toml +++ b/uc-fleet/Cargo.toml @@ -12,8 +12,8 @@ name = "solverforge-fleet" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = ["serde", "console", "verbose-logging"] } -solverforge-core = "0.25.0" +solverforge = { version = "0.25.1", features = ["serde", "console", "verbose-logging"] } +solverforge-core = "0.25.1" solverforge-ui = "0.9.0" # Web server axum = "0.8.9" diff --git a/uc-fleet/README.md b/uc-fleet/README.md index 74c57ba..42dc90d 100644 --- a/uc-fleet/README.md +++ b/uc-fleet/README.md @@ -42,7 +42,7 @@ local command surface. - Package and release binary: `solverforge-fleet` `0.1.0` - Rust: `1.95` -- SolverForge runtime: `solverforge` and `solverforge-core` `0.25.0`, locked +- SolverForge runtime: `solverforge` and `solverforge-core` `0.25.1`, locked across the whole `solverforge-*` family - Browser UI assets: `solverforge-ui` `0.9.0` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` diff --git a/uc-fleet/solverforge.app.toml b/uc-fleet/solverforge.app.toml index a029396..79a39ed 100644 --- a/uc-fleet/solverforge.app.toml +++ b/uc-fleet/solverforge.app.toml @@ -4,8 +4,8 @@ starter = "neutral-shell" cli_version = "2.2.2" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-fleet/src/constraints/assemble.rs b/uc-fleet/src/constraints/assemble.rs new file mode 100644 index 0000000..40df6a9 --- /dev/null +++ b/uc-fleet/src/constraints/assemble.rs @@ -0,0 +1,26 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::dock_capacity::constraint(), + super::dock_compatibility::constraint(), + super::dock_outage::constraint(), + super::inspection_training_precedence::constraint(), + super::maximize_ready_days::constraint(), + super::minimize_churn::constraint(), + super::minimize_deferral::constraint(), + super::minimize_inspection_lateness::constraint(), + super::minimize_overtime::constraint(), + super::minimize_readiness_shortfall::constraint(), + super::parts_availability::constraint(), + super::required_assignments::constraint(), + super::technician_capacity::constraint(), + super::weekly_readiness_floor::constraint(), + super::work_window::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-fleet/src/constraints/mod.rs b/uc-fleet/src/constraints/mod.rs index e379139..25b2d60 100644 --- a/uc-fleet/src/constraints/mod.rs +++ b/uc-fleet/src/constraints/mod.rs @@ -1,13 +1,3 @@ -/* Constraint definitions. - -Add constraint modules with `solverforge generate constraint ...`. -The neutral shell starts with an empty constraint set. */ - -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules mod dock_capacity; mod dock_compatibility; @@ -26,30 +16,7 @@ mod weekly_readiness_floor; mod work_window; // @solverforge:end constraint-modules -mod assemble { - use super::*; - - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - dock_capacity::constraint(), - dock_compatibility::constraint(), - dock_outage::constraint(), - inspection_training_precedence::constraint(), - maximize_ready_days::constraint(), - minimize_churn::constraint(), - minimize_deferral::constraint(), - minimize_inspection_lateness::constraint(), - minimize_overtime::constraint(), - minimize_readiness_shortfall::constraint(), - parts_availability::constraint(), - required_assignments::constraint(), - technician_capacity::constraint(), - weekly_readiness_floor::constraint(), - work_window::constraint(), - ) - // @solverforge:end constraint-calls - } -} - +mod assemble; pub(crate) mod support; + +pub use assemble::create_constraints; diff --git a/uc-fleet/tests/project_shape.rs b/uc-fleet/tests/project_shape.rs index 2f092d4..39bef49 100644 --- a/uc-fleet/tests/project_shape.rs +++ b/uc-fleet/tests/project_shape.rs @@ -118,7 +118,7 @@ fn public_dataset_and_daily_readiness_contract_are_explicit() { let builders = read("src/data/data_seed/builders.rs"); let data_seed = read("src/data/data_seed.rs"); let readiness = read("src/constraints/support/readiness.rs"); - let constraints = read("src/constraints/mod.rs"); + let constraints = read("src/constraints/assemble.rs"); assert_eq!(catalog.matches("VesselSpec { id:").count(), 24); assert_eq!(catalog.matches("wp!(").count(), 24); diff --git a/uc-flightcrew/Cargo.lock b/uc-flightcrew/Cargo.lock index 84cef0b..b1bb66b 100644 --- a/uc-flightcrew/Cargo.lock +++ b/uc-flightcrew/Cargo.lock @@ -1515,9 +1515,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -1530,9 +1530,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -1541,9 +1541,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -1553,9 +1553,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -1563,9 +1563,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -1591,9 +1591,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -1617,18 +1617,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-flightcrew/Cargo.toml b/uc-flightcrew/Cargo.toml index 4b7b647..1315980 100644 --- a/uc-flightcrew/Cargo.toml +++ b/uc-flightcrew/Cargo.toml @@ -12,7 +12,7 @@ name = "solverforge-flightcrew" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = ["serde", "console", "verbose-logging"] } +solverforge = { version = "0.25.1", features = ["serde", "console", "verbose-logging"] } solverforge-ui = { version = "0.9.0" } solverforge-maps = { version = "2.1.5" } # Web server diff --git a/uc-flightcrew/solverforge.app.toml b/uc-flightcrew/solverforge.app.toml index de272da..518c20a 100644 --- a/uc-flightcrew/solverforge.app.toml +++ b/uc-flightcrew/solverforge.app.toml @@ -8,8 +8,8 @@ shell = "web" cli_version = "3.1.0" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-flightcrew/src/constraints/assemble.rs b/uc-flightcrew/src/constraints/assemble.rs new file mode 100644 index 0000000..fc63474 --- /dev/null +++ b/uc-flightcrew/src/constraints/assemble.rs @@ -0,0 +1,23 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::assigned_crew::constraint(), + super::consecutive_long_haul_recovery::constraint(), + super::employee_unavailable::constraint(), + super::extended_recovery_rest::constraint(), + super::first_assignment_home::constraint(), + super::flight_conflict::constraint(), + super::last_assignment_home::constraint(), + super::long_haul_recovery::constraint(), + super::minimum_rest_away::constraint(), + super::minimum_rest_home::constraint(), + super::required_skill::constraint(), + super::transfer_continuity::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-flightcrew/src/constraints/mod.rs b/uc-flightcrew/src/constraints/mod.rs index 8b3c5eb..27f0d32 100644 --- a/uc-flightcrew/src/constraints/mod.rs +++ b/uc-flightcrew/src/constraints/mod.rs @@ -1,13 +1,3 @@ -/* Constraint definitions. - -Add constraint modules with `solverforge generate constraint ...`. -The neutral shell starts with an empty constraint set. */ - -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules mod assigned_crew; mod consecutive_long_haul_recovery; @@ -23,25 +13,6 @@ mod required_skill; mod transfer_continuity; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - assigned_crew::constraint(), - consecutive_long_haul_recovery::constraint(), - employee_unavailable::constraint(), - extended_recovery_rest::constraint(), - first_assignment_home::constraint(), - flight_conflict::constraint(), - last_assignment_home::constraint(), - long_haul_recovery::constraint(), - minimum_rest_away::constraint(), - minimum_rest_home::constraint(), - required_skill::constraint(), - transfer_continuity::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints; diff --git a/uc-fsr/Cargo.lock b/uc-fsr/Cargo.lock index 9a7308f..1c7e38b 100644 --- a/uc-fsr/Cargo.lock +++ b/uc-fsr/Cargo.lock @@ -1497,9 +1497,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -1512,9 +1512,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -1523,9 +1523,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -1535,9 +1535,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -1545,9 +1545,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -1573,9 +1573,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -1599,18 +1599,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand 0.10.1", "rayon", diff --git a/uc-fsr/Cargo.toml b/uc-fsr/Cargo.toml index c428595..f83b046 100644 --- a/uc-fsr/Cargo.toml +++ b/uc-fsr/Cargo.toml @@ -11,8 +11,8 @@ name = "solverforge_fsr" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = ["serde", "console", "verbose-logging"] } -solverforge-core = "0.25.0" +solverforge = { version = "0.25.1", features = ["serde", "console", "verbose-logging"] } +solverforge-core = "0.25.1" solverforge-ui = { version = "0.9.0" } solverforge-maps = { version = "2.1.5" } # Web server diff --git a/uc-fsr/README.md b/uc-fsr/README.md index c512801..0a6d128 100644 --- a/uc-fsr/README.md +++ b/uc-fsr/README.md @@ -55,8 +55,8 @@ make help - Package: `solverforge-fsr`; version is declared in `Cargo.toml` - Release binary: `solverforge_fsr` - Rust: `1.95` -- SolverForge runtime: `solverforge` `0.25.0` -- SolverForge core helpers: `solverforge-core` `0.25.0` +- SolverForge runtime: `solverforge` `0.25.1` +- SolverForge core helpers: `solverforge-core` `0.25.1` - Browser UI assets: `solverforge-ui` `0.9.0` - Routing engine: `solverforge-maps` `2.1.5` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` diff --git a/uc-fsr/WIREFRAME.md b/uc-fsr/WIREFRAME.md index 9e5c6bb..a32af7b 100644 --- a/uc-fsr/WIREFRAME.md +++ b/uc-fsr/WIREFRAME.md @@ -93,7 +93,7 @@ It shows how to combine: │ Embedded search policy for list construction and local search. ├── solverforge.app.toml │ App metadata, demo IDs, model facts/entities, registry dependency sources, -│ and the `solverforge 0.25.0` runtime target. +│ and the `solverforge 0.25.1` runtime target. ├── Makefile │ Local build, validation, and Space/Docker commands. ├── Dockerfile diff --git a/uc-fsr/solverforge.app.toml b/uc-fsr/solverforge.app.toml index c4b8fb9..8d63681 100644 --- a/uc-fsr/solverforge.app.toml +++ b/uc-fsr/solverforge.app.toml @@ -5,8 +5,8 @@ cli_version = "2.2.2" shell = "web" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-fsr/src/constraints/assemble.rs b/uc-fsr/src/constraints/assemble.rs new file mode 100644 index 0000000..29ab6bf --- /dev/null +++ b/uc-fsr/src/constraints/assemble.rs @@ -0,0 +1,22 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::FieldServicePlan; +use solverforge::prelude::*; + +/// Collects the full scoring model used by `FieldServicePlan`. +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::assigned_visits::constraint(), + super::balance_workload::constraint(), + super::minimize_travel::constraint(), + super::priority_slack::constraint(), + super::reachable_legs::constraint(), + super::required_parts::constraint(), + super::required_skills::constraint(), + super::shift_capacity::constraint(), + super::territory_affinity::constraint(), + super::time_windows::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-fsr/src/constraints/mod.rs b/uc-fsr/src/constraints/mod.rs index 0cab0b0..b957c1a 100644 --- a/uc-fsr/src/constraints/mod.rs +++ b/uc-fsr/src/constraints/mod.rs @@ -4,14 +4,6 @@ //! `ConstraintFactory` streams. Route-level calculations are maintained as //! domain shadow values so the scoring layer stays declarative. -use crate::domain::FieldServicePlan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - -#[cfg(test)] -mod route_metrics_tests; - // @solverforge:begin constraint-modules mod assigned_visits; mod balance_workload; @@ -25,24 +17,8 @@ mod territory_affinity; mod time_windows; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; +#[cfg(test)] +mod route_metrics_tests; - /// Collects the full scoring model used by `FieldServicePlan`. - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - assigned_visits::constraint(), - balance_workload::constraint(), - minimize_travel::constraint(), - priority_slack::constraint(), - reachable_legs::constraint(), - required_parts::constraint(), - required_skills::constraint(), - shift_capacity::constraint(), - territory_affinity::constraint(), - time_windows::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints; diff --git a/uc-furnace/AGENTS.md b/uc-furnace/AGENTS.md index ea8b540..3bc29a4 100644 --- a/uc-furnace/AGENTS.md +++ b/uc-furnace/AGENTS.md @@ -8,24 +8,31 @@ name `uc-furnace`; product copy, metadata, and UI labels should use `solverforge-furnace` or SolverForge Furnace. - `src/domain/mod.rs` owns the `solverforge::planning_model!` manifest. -- `src/domain/plan.rs` owns the `Plan` planning solution and wires the - `solver_toml`, `scalar_groups`, and `conflict_repairs` attributes. -- `src/domain/resources.rs` owns the problem facts: `Furnace`, `WorkOrder`, - `Operator`, `Shift`, and `ShiftCoverageDemand`. -- `src/domain/furnace.rs` owns `FurnaceAssignment` and its five scalar planning - variables plus the furnace construction hooks. -- `src/domain/coverage.rs` owns `OperatorShiftAssignment` and its `shift_type` - scalar variable plus the roster construction hooks. +- `src/domain/plan.rs` owns the `Plan` planning solution, its `Plan::new` + constructor, and the CLI-managed `scalar-groups` and `conflict-repairs` + blocks that register the solver providers by name. Change those blocks with + `solverforge generate|destroy scalar-group|conflict-repair`, not by hand. +- `src/domain/{furnace,work_order,operator,shift,shift_coverage_demand}.rs` own + the problem facts, one type per file. +- `src/domain/furnace_assignment.rs` owns `FurnaceAssignment`, its + `FurnaceAssignmentInit` constructor payload, its five scalar planning + variables, and the furnace construction hooks. +- `src/domain/operator_shift_assignment.rs` owns `OperatorShiftAssignment`, its + `OperatorShiftAssignmentInit` payload, its `shift_type` scalar variable, and + the roster construction hooks. - `src/domain/{enums,constants,time,workforce,changeover,support}.rs` own the value vocabularies, time model, changeover math, and shared helpers. -- `src/constraints/` owns the score rules, grouped by `furnace_hard`, - `furnace_soft`, `staffing_hard`, `monitoring_hard`, `roster_hard`, and - `roster_soft`, with assembly in `mod.rs`. +- `src/constraints/` owns the score rules, one constraint per file whose + `.named(...)` id equals the module name; `mod.rs` only declares the modules, + `assemble.rs` builds the constraint set, and `shared.rs` holds scoring + helpers. `solverforge check` validates this layout. - `src/data/data_seed/` owns deterministic `STANDARD` demo generation. - `src/solver/` owns retained-job runtime orchestration, the grouped scalar providers, and the conflict-repair providers. - `src/api/` owns REST, DTO, analysis, and SSE surfaces. -- `static/` owns the browser shell and generated view model. +- `static/` owns the browser shell. The CLI rewrites + `static/generated/ui-model.json`; the app's tabs and hard/soft constraint + split live in `static/app/model.js`. - `Dockerfile`, `Makefile`, `solver.toml`, and `solverforge.app.toml` define the deployment and runtime contract. diff --git a/uc-furnace/Cargo.lock b/uc-furnace/Cargo.lock index b5587b6..1973f46 100644 --- a/uc-furnace/Cargo.lock +++ b/uc-furnace/Cargo.lock @@ -764,9 +764,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -779,9 +779,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -790,9 +790,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -802,9 +802,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -812,9 +812,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -839,9 +839,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -850,18 +850,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-furnace/Cargo.toml b/uc-furnace/Cargo.toml index 9cc3c92..91f71cd 100644 --- a/uc-furnace/Cargo.toml +++ b/uc-furnace/Cargo.toml @@ -12,7 +12,7 @@ name = "solverforge-furnace" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = [ +solverforge = { version = "0.25.1", features = [ "serde", "console", "verbose-logging", diff --git a/uc-furnace/README.md b/uc-furnace/README.md index fcd2038..0ba0020 100644 --- a/uc-furnace/README.md +++ b/uc-furnace/README.md @@ -56,7 +56,7 @@ make help - Package: `solverforge-furnace`; version is declared in `Cargo.toml` - Release binary: `solverforge-furnace` - Rust: `1.95` -- SolverForge runtime: `solverforge` `0.25.0` +- SolverForge runtime: `solverforge` `0.25.1` - Browser UI assets: `solverforge-ui` `0.9.0` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` @@ -216,13 +216,14 @@ make space-run 1. `src/domain/mod.rs` The `planning_model!` manifest and public domain exports. 2. `src/domain/plan.rs` - The `Plan` solution, fact collections, and entity collections. -3. `src/domain/resources.rs` + The `Plan` solution, fact collections, entity collections, and the + registered scalar groups and conflict repairs. +3. `src/domain/{furnace,work_order,operator,shift,shift_coverage_demand}.rs` `Furnace`, `WorkOrder`, `Operator`, `Shift`, and `ShiftCoverageDemand`. -4. `src/domain/furnace.rs` and `src/domain/coverage.rs` +4. `src/domain/furnace_assignment.rs` and `src/domain/operator_shift_assignment.rs` The two planning entities and their derived task/roster helpers. -5. `src/constraints/mod.rs` and `src/constraints/*.rs` - The score model, one rule group per file. +5. `src/constraints/assemble.rs` and `src/constraints/*.rs` + The score model, one constraint per file. 6. `src/data/data_seed/` The deterministic `STANDARD` demo generator. 7. `src/solver/service.rs` diff --git a/uc-furnace/WIREFRAME.md b/uc-furnace/WIREFRAME.md index 999deea..1dea819 100644 --- a/uc-furnace/WIREFRAME.md +++ b/uc-furnace/WIREFRAME.md @@ -111,7 +111,7 @@ It shows how to combine: │ polish. ├── solverforge.app.toml │ App metadata, demo IDs, model facts/entities/variables, the 30-constraint -│ manifest, and the `solverforge 0.25.0` runtime target. +│ manifest, and the `solverforge 0.25.1` runtime target. ├── Makefile │ Local build, validation, inline browser smoke, and Space/Docker commands. ├── Dockerfile @@ -129,8 +129,8 @@ It shows how to combine: │ │ `planning_model!` manifest, facts, both planning entities, `Plan`, and │ │ time/changeover/label helpers. │ ├── constraints/ -│ │ Seven score-rule modules (furnace, staffing, monitoring, roster hard and -│ │ soft) plus the assembler in `mod.rs`. +│ │ Thirty single-constraint modules declared in `mod.rs`, the constraint +│ │ set in `assemble.rs`, and scoring helpers in `shared.rs`. │ ├── data/ │ │ Deterministic `STANDARD` demo-data generator, process specs, and seed │ │ catalog. @@ -146,6 +146,8 @@ It shows how to combine: ├── app.js └── app/ runtime.js Browser boot, solver lifecycle, tabs, and API guide. + model.js App tabs, hard/soft constraint split, and data-table + collections over the CLI-generated ui-model.json. render.js Overview KPIs, crew table, orders table, data tables. schedule.js Furnace-lane timeline model and unassigned section. analysis.js Score-analysis modal and per-constraint drilldown. @@ -206,13 +208,16 @@ intentionally uses an inline Playwright smoke in `Makefile` instead of a `furnace_assignment`, `roster_shift_assignment`, `task_operator_assignment`, and the composite `furnace_schedule_task_assignment`. - Conflict-repair providers in `src/solver/conflict_repair.rs`: - `minimumRest`, `visibleShiftLimit`, `taskOperatorOnOwningShift`, - `shiftRoleCoverage`, `monitoringCapacity`, `furnaceOverlap`, and - `changeoverGap`. - -The `Plan` macro wires both by name through the -`scalar_groups = "crate::solver::scalar_groups::groups"` and -`conflict_repairs = "crate::solver::conflict_repair::providers"` attributes. + `minimum_rest`, `visible_shift_limit`, `task_operator_on_owning_shift`, + `shift_role_coverage`, `monitoring_capacity`, `furnace_overlap`, and + `changeover_gap`. + +`solverforge generate scalar-group` and `solverforge generate conflict-repair` +register them in the CLI-managed `scalar-groups` and `conflict-repairs` blocks +of `src/domain/plan.rs`, which the `Plan` macro reads through its +`scalar_groups = "scalar_groups"` and `conflict_repairs = "conflict_repairs"` +attributes. `solverforge.app.toml` records the same registrations, and +`solverforge check` verifies every `solver.toml` reference against them. ## Validation Surfaces diff --git a/uc-furnace/solver.toml b/uc-furnace/solver.toml index 2b92529..3db693e 100644 --- a/uc-furnace/solver.toml +++ b/uc-furnace/solver.toml @@ -33,13 +33,13 @@ score_tie_break = "first" [[phases.neighborhoods]] type = "compound_conflict_repair_move_selector" constraints = [ - "minimumRest", - "visibleShiftLimit", - "taskOperatorOnOwningShift", - "shiftRoleCoverage", - "monitoringCapacity", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "task_operator_on_owning_shift", + "shift_role_coverage", + "monitoring_capacity", + "furnace_overlap", + "changeover_gap", ] max_matches_per_step = 16 max_repairs_per_match = 32 @@ -53,10 +53,10 @@ require_hard_improvement = true [[phases.neighborhoods.selectors]] type = "compound_conflict_repair_move_selector" constraints = [ - "minimumRest", - "visibleShiftLimit", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "furnace_overlap", + "changeover_gap", ] max_matches_per_step = 16 max_repairs_per_match = 8 @@ -107,13 +107,13 @@ selection_order = "round_robin" [[phases.move_selector.selectors]] type = "compound_conflict_repair_move_selector" constraints = [ - "minimumRest", - "visibleShiftLimit", - "taskOperatorOnOwningShift", - "shiftRoleCoverage", - "monitoringCapacity", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "task_operator_on_owning_shift", + "shift_role_coverage", + "monitoring_capacity", + "furnace_overlap", + "changeover_gap", ] max_matches_per_step = 16 max_repairs_per_match = 32 @@ -127,10 +127,10 @@ require_hard_improvement = true [[phases.move_selector.selectors.selectors]] type = "compound_conflict_repair_move_selector" constraints = [ - "minimumRest", - "visibleShiftLimit", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "furnace_overlap", + "changeover_gap", ] max_matches_per_step = 16 max_repairs_per_match = 8 diff --git a/uc-furnace/solverforge.app.toml b/uc-furnace/solverforge.app.toml index 37cb571..17cf259 100644 --- a/uc-furnace/solverforge.app.toml +++ b/uc-furnace/solverforge.app.toml @@ -1,23 +1,23 @@ [app] name = "SolverForge Furnace" starter = "neutral-shell" -cli_version = "2.2.2" shell = "web" +cli_version = "2.2.2" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] default_size = "STANDARD" -available_sizes = [ - "STANDARD", -] +available_sizes = ["STANDARD"] [solution] name = "Plan" score = "HardSoftScore" +scalar_groups_path = "scalar_groups" +conflict_repairs_path = "conflict_repairs" [[facts]] name = "furnace" @@ -62,6 +62,8 @@ kind = "scalar" range = "compatible_assignments" elements = "" allows_unassigned = true +construction_entity_order_key = "furnace_assignment_construction_entity_order_key" +construction_value_order_key = "furnace_assignment_construction_value_order_key" enabled = true [[variables]] @@ -72,6 +74,8 @@ kind = "scalar" range = "eligible_load_build_operator_ids" elements = "" allows_unassigned = true +construction_entity_order_key = "task_operator_construction_entity_order_key" +construction_value_order_key = "load_build_operator_construction_value_order_key" enabled = true [[variables]] @@ -82,6 +86,8 @@ kind = "scalar" range = "eligible_program_operator_ids" elements = "" allows_unassigned = true +construction_entity_order_key = "task_operator_construction_entity_order_key" +construction_value_order_key = "program_operator_construction_value_order_key" enabled = true [[variables]] @@ -92,6 +98,8 @@ kind = "scalar" range = "eligible_quench_operator_ids" elements = "" allows_unassigned = true +construction_entity_order_key = "task_operator_construction_entity_order_key" +construction_value_order_key = "quench_operator_construction_value_order_key" enabled = true [[variables]] @@ -102,6 +110,8 @@ kind = "scalar" range = "eligible_unload_operator_ids" elements = "" allows_unassigned = true +construction_entity_order_key = "task_operator_construction_entity_order_key" +construction_value_order_key = "unload_operator_construction_value_order_key" enabled = true [[variables]] @@ -112,154 +122,339 @@ kind = "scalar" range = "allowed_shift_types" elements = "" allows_unassigned = true +construction_entity_order_key = "operator_shift_construction_entity_order_key" +construction_value_order_key = "operator_shift_construction_value_order_key" enabled = true [[constraints]] -name = "unassigned_orders" -module = "furnace_hard" +name = "assigned_tasks_require_scheduled_furnace" +module = "assigned_tasks_require_scheduled_furnace" enabled = true [[constraints]] -name = "incompatible_process" -module = "furnace_hard" +name = "changeover_gap" +module = "changeover_gap" enabled = true [[constraints]] -name = "excessive_temperature" -module = "furnace_hard" +name = "consecutive_nights" +module = "consecutive_nights" enabled = true [[constraints]] -name = "excessive_load" -module = "furnace_hard" +name = "day_only_night" +module = "day_only_night" enabled = true [[constraints]] -name = "outside_week" -module = "furnace_hard" +name = "early_start_pressure" +module = "early_start_pressure" enabled = true [[constraints]] -name = "furnace_overlap" -module = "furnace_hard" +name = "excessive_load" +module = "excessive_load" enabled = true [[constraints]] -name = "changeover_gap" -module = "furnace_hard" +name = "excessive_temperature" +module = "excessive_temperature" enabled = true [[constraints]] -name = "load_build_shift_ownership" -module = "furnace_hard" +name = "express_lateness" +module = "express_lateness" enabled = true [[constraints]] -name = "program_shift_ownership" -module = "furnace_hard" +name = "furnace_overlap" +module = "furnace_overlap" enabled = true [[constraints]] -name = "quench_shift_ownership" -module = "furnace_hard" +name = "incompatible_process" +module = "incompatible_process" enabled = true [[constraints]] -name = "unload_shift_ownership" -module = "furnace_hard" +name = "load_build_shift_ownership" +module = "load_build_shift_ownership" enabled = true [[constraints]] -name = "assigned_tasks_require_scheduled_furnace" -module = "staffing_hard" +name = "minimum_rest" +module = "minimum_rest" enabled = true [[constraints]] -name = "required_task_assigned" -module = "staffing_hard" +name = "monitoring_capacity" +module = "monitoring_capacity" enabled = true [[constraints]] -name = "task_operator_skilled" -module = "staffing_hard" +name = "night_start_preference" +module = "night_start_preference" enabled = true [[constraints]] -name = "task_operator_on_owning_shift" -module = "staffing_hard" +name = "operator_double_booked" +module = "operator_double_booked" enabled = true [[constraints]] -name = "operator_double_booked" -module = "staffing_hard" +name = "outside_week" +module = "outside_week" enabled = true [[constraints]] -name = "shift_role_coverage" -module = "staffing_hard" +name = "overtime" +module = "overtime" enabled = true [[constraints]] -name = "monitoring_capacity" -module = "monitoring_hard" +name = "program_shift_ownership" +module = "program_shift_ownership" enabled = true [[constraints]] -name = "day_only_night" -module = "roster_hard" +name = "quench_shift_ownership" +module = "quench_shift_ownership" enabled = true [[constraints]] -name = "minimum_rest" -module = "roster_hard" +name = "required_task_assigned" +module = "required_task_assigned" enabled = true [[constraints]] -name = "visible_shift_limit" -module = "roster_hard" +name = "shift_load_balance" +module = "shift_load_balance" enabled = true [[constraints]] -name = "consecutive_nights" -module = "roster_hard" +name = "shift_role_coverage" +module = "shift_role_coverage" enabled = true [[constraints]] -name = "express_lateness" -module = "furnace_soft" +name = "standard_lateness" +module = "standard_lateness" enabled = true [[constraints]] -name = "urgent_lateness" -module = "furnace_soft" +name = "task_operator_on_owning_shift" +module = "task_operator_on_owning_shift" enabled = true [[constraints]] -name = "standard_lateness" -module = "furnace_soft" +name = "task_operator_skilled" +module = "task_operator_skilled" enabled = true [[constraints]] name = "thermal_changeover" -module = "furnace_soft" +module = "thermal_changeover" enabled = true [[constraints]] -name = "early_start_pressure" -module = "furnace_soft" +name = "unassigned_orders" +module = "unassigned_orders" enabled = true [[constraints]] -name = "night_start_preference" -module = "furnace_soft" +name = "unload_shift_ownership" +module = "unload_shift_ownership" enabled = true [[constraints]] -name = "overtime" -module = "roster_soft" +name = "urgent_lateness" +module = "urgent_lateness" enabled = true [[constraints]] -name = "shift_load_balance" -module = "roster_soft" +name = "visible_shift_limit" +module = "visible_shift_limit" +enabled = true + +[[scalar_groups]] +name = "furnace_assignment" +kind = "candidates" +candidate_provider = "crate::solver::scalar_groups::furnace_assignment_candidates" +solver_config = false +enabled = true + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "assignment" + +[scalar_groups.assignment_hooks] +required_entity = "" +capacity_key = "" +assignment_rule = "" +position_key = "" +sequence_key = "" +entity_order = "" +value_order = "" + +[scalar_groups.limits] + +[[scalar_groups]] +name = "roster_shift_assignment" +kind = "candidates" +candidate_provider = "crate::solver::scalar_groups::roster_shift_assignment_candidates" +solver_config = false +enabled = true + +[[scalar_groups.targets]] +entity = "operator_shift_assignment" +entity_plural = "operator_shift_assignments" +field = "shift_type" + +[scalar_groups.assignment_hooks] +required_entity = "" +capacity_key = "" +assignment_rule = "" +position_key = "" +sequence_key = "" +entity_order = "" +value_order = "" + +[scalar_groups.limits] + +[[scalar_groups]] +name = "task_operator_assignment" +kind = "candidates" +candidate_provider = "crate::solver::scalar_groups::task_operator_assignment_candidates" +solver_config = false +enabled = true + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "load_build_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "program_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "quench_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "unload_operator_id" + +[scalar_groups.assignment_hooks] +required_entity = "" +capacity_key = "" +assignment_rule = "" +position_key = "" +sequence_key = "" +entity_order = "" +value_order = "" + +[scalar_groups.limits] + +[[scalar_groups]] +name = "furnace_schedule_task_assignment" +kind = "candidates" +candidate_provider = "crate::solver::scalar_groups::furnace_schedule_task_assignment_candidates" +solver_config = false +enabled = true + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "assignment" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "load_build_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "program_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "quench_operator_id" + +[[scalar_groups.targets]] +entity = "furnace_assignment" +entity_plural = "assignments" +field = "unload_operator_id" + +[scalar_groups.assignment_hooks] +required_entity = "" +capacity_key = "" +assignment_rule = "" +position_key = "" +sequence_key = "" +entity_order = "" +value_order = "" + +[scalar_groups.limits] + +[[conflict_repairs]] +constraint = "minimum_rest" +provider = "crate::solver::conflict_repair::minimum_rest_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "visible_shift_limit" +provider = "crate::solver::conflict_repair::visible_shift_limit_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "task_operator_on_owning_shift" +provider = "crate::solver::conflict_repair::task_owning_shift_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "shift_role_coverage" +provider = "crate::solver::conflict_repair::shift_role_coverage_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "monitoring_capacity" +provider = "crate::solver::conflict_repair::monitoring_capacity_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "furnace_overlap" +provider = "crate::solver::conflict_repair::furnace_overlap_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false +enabled = true + +[[conflict_repairs]] +constraint = "changeover_gap" +provider = "crate::solver::conflict_repair::changeover_gap_repairs" +selector = "compound" +include_soft_matches = false +solver_config = false enabled = true diff --git a/uc-furnace/src/api/dto/plan.rs b/uc-furnace/src/api/dto/plan.rs index 5cbb10b..d33c7e9 100644 --- a/uc-furnace/src/api/dto/plan.rs +++ b/uc-furnace/src/api/dto/plan.rs @@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize}; use crate::domain::{ canonical_interval_label, canonical_minute_label, furnace_accepts_work_order, Furnace, - FurnaceAssignment, FurnaceType, HeatTreatmentProcess, Operator, OperatorRole, - OperatorShiftAssignment, OperatorSkill, Plan, PriorityBand, Shift, ShiftCoverageDemand, - ShiftType, SkillMask, WorkOrder, + FurnaceAssignment, FurnaceAssignmentInit, FurnaceType, HeatTreatmentProcess, Operator, + OperatorRole, OperatorShiftAssignment, OperatorShiftAssignmentInit, OperatorSkill, Plan, + PriorityBand, Shift, ShiftCoverageDemand, ShiftType, SkillMask, WorkOrder, }; use std::collections::{HashMap, HashSet}; @@ -245,26 +245,34 @@ impl PlanDto { .iter() .map(|assignment| { Ok(FurnaceAssignment { - work_order_idx: assignment.work_order_idx, - process: parse_process(&assignment.process)?, - temperature_celsius: assignment.temperature_celsius, - soak_time_minutes: assignment.soak_time_minutes, - load_weight_kg: assignment.load_weight_kg, - due_datetime_minutes: assignment.due_datetime_minutes, - priority: parse_priority(&assignment.priority)?, - requires_quench: assignment.requires_quench, - compatible_assignments: assignment.compatible_assignments.clone(), assignment: assignment.assignment, - eligible_load_build_operator_ids: assignment - .eligible_load_build_operator_ids - .clone(), - eligible_program_operator_ids: assignment.eligible_program_operator_ids.clone(), - eligible_quench_operator_ids: assignment.eligible_quench_operator_ids.clone(), - eligible_unload_operator_ids: assignment.eligible_unload_operator_ids.clone(), load_build_operator_id: assignment.load_build_operator_id, program_operator_id: assignment.program_operator_id, quench_operator_id: assignment.quench_operator_id, unload_operator_id: assignment.unload_operator_id, + ..FurnaceAssignment::new(FurnaceAssignmentInit { + work_order_idx: assignment.work_order_idx, + process: parse_process(&assignment.process)?, + temperature_celsius: assignment.temperature_celsius, + soak_time_minutes: assignment.soak_time_minutes, + load_weight_kg: assignment.load_weight_kg, + due_datetime_minutes: assignment.due_datetime_minutes, + priority: parse_priority(&assignment.priority)?, + requires_quench: assignment.requires_quench, + compatible_assignments: assignment.compatible_assignments.clone(), + eligible_load_build_operator_ids: assignment + .eligible_load_build_operator_ids + .clone(), + eligible_program_operator_ids: assignment + .eligible_program_operator_ids + .clone(), + eligible_quench_operator_ids: assignment + .eligible_quench_operator_ids + .clone(), + eligible_unload_operator_ids: assignment + .eligible_unload_operator_ids + .clone(), + }) }) }) .collect::, String>>()?; @@ -294,22 +302,24 @@ impl PlanDto { .iter() .map(|assignment| { Ok(OperatorShiftAssignment { - id: assignment.id, - operator_idx: assignment.operator_id, - operator_name: leak_string(&assignment.operator_name), - role: parse_operator_role(&assignment.role)?, - day_only: assignment.day_only, - roster_day: assignment.roster_day, - skill_mask: *operator_skill_by_id - .get(&assignment.operator_id) - .ok_or_else(|| { - format!( - "operatorShiftAssignments[{}] references unknown operator {}", - assignment.id, assignment.operator_id - ) - })?, - allowed_shift_types: assignment.allowed_shift_types.clone(), shift_type: assignment.shift_type_value, + ..OperatorShiftAssignment::new(OperatorShiftAssignmentInit { + id: assignment.id, + operator_idx: assignment.operator_id, + operator_name: leak_string(&assignment.operator_name), + role: parse_operator_role(&assignment.role)?, + day_only: assignment.day_only, + roster_day: assignment.roster_day, + skill_mask: *operator_skill_by_id + .get(&assignment.operator_id) + .ok_or_else(|| { + format!( + "operatorShiftAssignments[{}] references unknown operator {}", + assignment.id, assignment.operator_id + ) + })?, + allowed_shift_types: assignment.allowed_shift_types.clone(), + }) }) }) .collect::, String>>()?; @@ -318,7 +328,7 @@ impl PlanDto { validate_shift_coverage_demands(&shift_coverage_demands, &shifts)?; validate_operator_shift_assignments(&operator_shift_assignments)?; - Ok(Plan { + Ok(Plan::new( furnaces, work_orders, operators, @@ -326,8 +336,7 @@ impl PlanDto { shift_coverage_demands, assignments, operator_shift_assignments, - score: None, - }) + )) } pub fn from_plan(plan: &Plan) -> Self { diff --git a/uc-furnace/src/api/routes/analysis.rs b/uc-furnace/src/api/routes/analysis.rs index 6deeba2..c9faccf 100644 --- a/uc-furnace/src/api/routes/analysis.rs +++ b/uc-furnace/src/api/routes/analysis.rs @@ -104,14 +104,14 @@ fn constraint_to_dto(analysis: &ConstraintAnalysis) -> Constraint fn constraint_type(name: &str) -> &'static str { match name { - "expressLateness" - | "urgentLateness" - | "standardLateness" - | "thermalChangeover" - | "earlyStartPressure" - | "nightStartPreference" + "express_lateness" + | "urgent_lateness" + | "standard_lateness" + | "thermal_changeover" + | "early_start_pressure" + | "night_start_preference" | "overtime" - | "shiftLoadBalance" => "soft", + | "shift_load_balance" => "soft", _ => "hard", } } diff --git a/uc-furnace/src/constraints/assemble.rs b/uc-furnace/src/constraints/assemble.rs new file mode 100644 index 0000000..6f826c7 --- /dev/null +++ b/uc-furnace/src/constraints/assemble.rs @@ -0,0 +1,48 @@ +//! Assembles the furnace planning constraint set. + +use crate::domain::Plan; +use solverforge::prelude::*; + +/// Builds the complete furnace planning constraint set. +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + ( + super::unassigned_orders::constraint(), + super::incompatible_process::constraint(), + super::excessive_temperature::constraint(), + super::excessive_load::constraint(), + super::outside_week::constraint(), + super::furnace_overlap::constraint(), + super::changeover_gap::constraint(), + super::load_build_shift_ownership::constraint(), + super::program_shift_ownership::constraint(), + super::quench_shift_ownership::constraint(), + super::unload_shift_ownership::constraint(), + super::assigned_tasks_require_scheduled_furnace::constraint(), + ), + ( + super::required_task_assigned::constraint(), + super::task_operator_skilled::constraint(), + super::task_operator_on_owning_shift::constraint(), + super::operator_double_booked::constraint(), + super::shift_role_coverage::constraint(), + super::monitoring_capacity::constraint(), + super::day_only_night::constraint(), + super::minimum_rest::constraint(), + super::visible_shift_limit::constraint(), + super::consecutive_nights::constraint(), + super::express_lateness::constraint(), + super::urgent_lateness::constraint(), + ), + ( + super::standard_lateness::constraint(), + super::thermal_changeover::constraint(), + super::early_start_pressure::constraint(), + super::night_start_preference::constraint(), + super::overtime::constraint(), + super::shift_load_balance::constraint(), + ), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-furnace/src/constraints/assigned_tasks_require_scheduled_furnace.rs b/uc-furnace/src/constraints/assigned_tasks_require_scheduled_furnace.rs new file mode 100644 index 0000000..0844854 --- /dev/null +++ b/uc-furnace/src/constraints/assigned_tasks_require_scheduled_furnace.rs @@ -0,0 +1,12 @@ +use super::shared::*; + +/// Requires manual task assignments to reference a scheduled furnace job. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .project(AssignedTaskWithoutScheduleViolations) + .penalize(hard_weight(|violation: &HardViolation| { + HardSoftScore::of_hard(violation.weight) + })) + .named("assigned_tasks_require_scheduled_furnace") +} diff --git a/uc-furnace/src/constraints/changeover_gap.rs b/uc-furnace/src/constraints/changeover_gap.rs new file mode 100644 index 0000000..4bda89f --- /dev/null +++ b/uc-furnace/src/constraints/changeover_gap.rs @@ -0,0 +1,40 @@ +use super::shared::*; + +/// Penalizes back-to-back furnace jobs that leave less than the required changeover gap. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(( + ConstraintFactory::::new().assignments(), + equal_bi( + |left: &FurnaceAssignment| left.furnace_idx(), + |right: &FurnaceAssignment| right.furnace_idx(), + ), + )) + .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { + left.work_order_idx != right.work_order_idx + && right.assignment.is_some() + && left.end_minutes().unwrap() <= right.start_minutes().unwrap() + && changeover_shortage( + left.end_minutes().unwrap(), + right.start_minutes().unwrap(), + calculate_changeover_cost_for_sequence(left, right) as usize, + ) + .is_some() + }) + .penalize(hard_weight( + |left: &FurnaceAssignment, right: &FurnaceAssignment| { + HardSoftScore::of_hard( + changeover_shortage( + left.end_minutes().unwrap(), + right.start_minutes().unwrap(), + calculate_changeover_cost_for_sequence(left, right) as usize, + ) + .unwrap() as i64 + * 10, + ) + }, + )) + .named("changeover_gap") +} diff --git a/uc-furnace/src/constraints/consecutive_nights.rs b/uc-furnace/src/constraints/consecutive_nights.rs new file mode 100644 index 0000000..cb95662 --- /dev/null +++ b/uc-furnace/src/constraints/consecutive_nights.rs @@ -0,0 +1,16 @@ +use super::shared::*; + +/// Caps consecutive night-shift windows for each operator. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .operator_shift_assignments() + .project(OperatorNightWindowEntries) + .group_by( + |entry: &NightWindowEntry| (entry.operator_id, entry.window_start_day), + sum(|entry: &NightWindowEntry| entry.delta), + ) + .penalize(hard_weight(|_window: &(usize, i32), night_shifts: &i64| { + HardSoftScore::of_hard((*night_shifts - MAX_CONSECUTIVE_NIGHTS as i64).max(0) * 900) + })) + .named("consecutive_nights") +} diff --git a/uc-furnace/src/constraints/day_only_night.rs b/uc-furnace/src/constraints/day_only_night.rs new file mode 100644 index 0000000..0849f36 --- /dev/null +++ b/uc-furnace/src/constraints/day_only_night.rs @@ -0,0 +1,14 @@ +use super::shared::*; + +/// Prevents day-only operators from being assigned to night shifts. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .operator_shift_assignments() + .filter(|assignment: &OperatorShiftAssignment| { + assignment.day_only && assignment.shift_type_enum() == Some(ShiftType::Night) + }) + .penalize(hard_weight(|_: &OperatorShiftAssignment| { + HardSoftScore::of_hard(1_200) + })) + .named("day_only_night") +} diff --git a/uc-furnace/src/constraints/early_start_pressure.rs b/uc-furnace/src/constraints/early_start_pressure.rs new file mode 100644 index 0000000..b9e692c --- /dev/null +++ b/uc-furnace/src/constraints/early_start_pressure.rs @@ -0,0 +1,20 @@ +use super::shared::*; + +/// Penalizes completing work earlier than necessary to reduce early-start pressure. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| { + assignment + .end_minutes() + .is_some_and(|end| end < assignment.due_datetime_minutes) + }) + .penalize(|assignment: &FurnaceAssignment| { + early_start_pressure_score( + assignment.end_minutes().unwrap(), + assignment.due_datetime_minutes, + ) + .unwrap() + }) + .named("early_start_pressure") +} diff --git a/uc-furnace/src/constraints/excessive_load.rs b/uc-furnace/src/constraints/excessive_load.rs new file mode 100644 index 0000000..1414bcc --- /dev/null +++ b/uc-furnace/src/constraints/excessive_load.rs @@ -0,0 +1,26 @@ +use super::shared::*; + +/// Penalizes assignments whose load weight exceeds the selected furnace capacity. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(( + ConstraintFactory::::new().furnaces(), + equal_bi( + |assignment: &FurnaceAssignment| assignment.furnace_idx(), + |furnace: &Furnace| Some(furnace.id), + ), + )) + .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { + !furnace.supports_load(assignment.load_weight_kg) + }) + .penalize(hard_weight( + |assignment: &FurnaceAssignment, furnace: &Furnace| { + HardSoftScore::of_hard( + (assignment.load_weight_kg - furnace.max_load_kg) as i64 * 10, + ) + }, + )) + .named("excessive_load") +} diff --git a/uc-furnace/src/constraints/excessive_temperature.rs b/uc-furnace/src/constraints/excessive_temperature.rs new file mode 100644 index 0000000..ec6dcd2 --- /dev/null +++ b/uc-furnace/src/constraints/excessive_temperature.rs @@ -0,0 +1,26 @@ +use super::shared::*; + +/// Penalizes assignments whose required temperature exceeds the selected furnace limit. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(( + ConstraintFactory::::new().furnaces(), + equal_bi( + |assignment: &FurnaceAssignment| assignment.furnace_idx(), + |furnace: &Furnace| Some(furnace.id), + ), + )) + .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { + !furnace.supports_temperature(assignment.temperature_celsius) + }) + .penalize(hard_weight( + |assignment: &FurnaceAssignment, furnace: &Furnace| { + HardSoftScore::of_hard( + (assignment.temperature_celsius - furnace.max_temp_celsius) as i64 * 20, + ) + }, + )) + .named("excessive_temperature") +} diff --git a/uc-furnace/src/constraints/express_lateness.rs b/uc-furnace/src/constraints/express_lateness.rs new file mode 100644 index 0000000..01b3fe7 --- /dev/null +++ b/uc-furnace/src/constraints/express_lateness.rs @@ -0,0 +1,22 @@ +use super::shared::*; + +/// Penalizes express work that finishes after its due time. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.priority == PriorityBand::Express) + .filter(|assignment: &FurnaceAssignment| { + assignment + .end_minutes() + .is_some_and(|end| end > assignment.due_datetime_minutes) + }) + .penalize(|assignment: &FurnaceAssignment| { + priority_lateness_score( + assignment.end_minutes().unwrap(), + assignment.due_datetime_minutes, + 60, + ) + .unwrap() + }) + .named("express_lateness") +} diff --git a/uc-furnace/src/constraints/furnace_hard.rs b/uc-furnace/src/constraints/furnace_hard.rs deleted file mode 100644 index 0a4076b..0000000 --- a/uc-furnace/src/constraints/furnace_hard.rs +++ /dev/null @@ -1,430 +0,0 @@ -use super::shared::*; - -/// Penalizes work orders that have not been assigned to a furnace and start time. -pub(super) fn unassigned_orders() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_none()) - .penalize(hard_weight(|_: &FurnaceAssignment| { - HardSoftScore::of_hard(30_000) - })) - .named("unassignedOrders") -} - -/// Penalizes assignments scheduled on furnaces that cannot run the required process. -pub(super) fn incompatible_process() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(( - ConstraintFactory::::new().furnaces(), - equal_bi( - |assignment: &FurnaceAssignment| assignment.furnace_idx(), - |furnace: &Furnace| Some(furnace.id), - ), - )) - .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { - !furnace.supports_process(assignment.process) - }) - .penalize(hard_weight(|_: &FurnaceAssignment, _: &Furnace| { - HardSoftScore::of_hard(4_000) - })) - .named("incompatibleProcess") -} - -/// Penalizes assignments whose required temperature exceeds the selected furnace limit. -pub(super) fn excessive_temperature() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(( - ConstraintFactory::::new().furnaces(), - equal_bi( - |assignment: &FurnaceAssignment| assignment.furnace_idx(), - |furnace: &Furnace| Some(furnace.id), - ), - )) - .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { - !furnace.supports_temperature(assignment.temperature_celsius) - }) - .penalize(hard_weight( - |assignment: &FurnaceAssignment, furnace: &Furnace| { - HardSoftScore::of_hard( - (assignment.temperature_celsius - furnace.max_temp_celsius) as i64 * 20, - ) - }, - )) - .named("excessiveTemperature") -} - -/// Penalizes assignments whose load weight exceeds the selected furnace capacity. -pub(super) fn excessive_load() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(( - ConstraintFactory::::new().furnaces(), - equal_bi( - |assignment: &FurnaceAssignment| assignment.furnace_idx(), - |furnace: &Furnace| Some(furnace.id), - ), - )) - .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { - !furnace.supports_load(assignment.load_weight_kg) - }) - .penalize(hard_weight( - |assignment: &FurnaceAssignment, furnace: &Furnace| { - HardSoftScore::of_hard( - (assignment.load_weight_kg - furnace.max_load_kg) as i64 * 10, - ) - }, - )) - .named("excessiveLoad") -} - -/// Penalizes scheduled work that finishes beyond the weekly planning horizon. -pub(super) fn outside_week() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| { - assignment - .end_minutes() - .is_some_and(|end| end > HORIZON_MINUTES) - }) - .penalize(hard_weight(|assignment: &FurnaceAssignment| { - HardSoftScore::of_hard((assignment.end_minutes().unwrap() - HORIZON_MINUTES) as i64 * 5) - })) - .named("outsideWeek") -} - -/// Penalizes overlapping jobs assigned to the same furnace. -pub(super) fn furnace_overlap() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(equal(|assignment: &FurnaceAssignment| { - assignment.furnace_idx() - })) - .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { - if left.work_order_idx >= right.work_order_idx { - return false; - } - let left_start = left.start_minutes().unwrap(); - let left_end = left.end_minutes().unwrap(); - let right_start = right.start_minutes().unwrap(); - let right_end = right.end_minutes().unwrap(); - left_start < right_end && right_start < left_end - }) - .penalize(hard_weight( - |left: &FurnaceAssignment, right: &FurnaceAssignment| { - let overlap_start = left - .start_minutes() - .unwrap() - .max(right.start_minutes().unwrap()); - let overlap_end = left - .end_minutes() - .unwrap() - .min(right.end_minutes().unwrap()); - HardSoftScore::of_hard((overlap_end - overlap_start) as i64 * 20) - }, - )) - .named("furnaceOverlap") -} - -/// Penalizes back-to-back furnace jobs that leave less than the required changeover gap. -pub(super) fn changeover_gap() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(( - ConstraintFactory::::new().assignments(), - equal_bi( - |left: &FurnaceAssignment| left.furnace_idx(), - |right: &FurnaceAssignment| right.furnace_idx(), - ), - )) - .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { - left.work_order_idx != right.work_order_idx - && right.assignment.is_some() - && left.end_minutes().unwrap() <= right.start_minutes().unwrap() - && changeover_shortage( - left.end_minutes().unwrap(), - right.start_minutes().unwrap(), - calculate_changeover_cost_for_sequence(left, right) as usize, - ) - .is_some() - }) - .penalize(hard_weight( - |left: &FurnaceAssignment, right: &FurnaceAssignment| { - HardSoftScore::of_hard( - changeover_shortage( - left.end_minutes().unwrap(), - right.start_minutes().unwrap(), - calculate_changeover_cost_for_sequence(left, right) as usize, - ) - .unwrap() as i64 - * 10, - ) - }, - )) - .named("changeoverGap") -} - -/// Requires load-build work to be owned by the shift covering that task interval. -pub(super) fn load_build_shift_ownership() -> impl IncrementalConstraint { - task_shift_ownership( - "loadBuildShiftOwnership", - |assignment| assignment.load_build_interval(), - |assignment| assignment.load_build_shift_identity(), - ) -} - -/// Requires programming work to be owned by the shift covering that task interval. -pub(super) fn program_shift_ownership() -> impl IncrementalConstraint { - task_shift_ownership( - "programShiftOwnership", - |assignment| assignment.program_interval(), - |assignment| assignment.program_shift_identity(), - ) -} - -/// Requires quench work to be owned by the shift covering that task interval. -pub(super) fn quench_shift_ownership() -> impl IncrementalConstraint { - task_shift_ownership( - "quenchShiftOwnership", - |assignment| assignment.quench_interval(), - |assignment| assignment.quench_shift_identity(), - ) -} - -/// Requires unload work to be owned by the shift covering that task interval. -pub(super) fn unload_shift_ownership() -> impl IncrementalConstraint { - task_shift_ownership( - "unloadShiftOwnership", - |assignment| assignment.unload_interval(), - |assignment| assignment.unload_shift_identity(), - ) -} - -/// Builds a hard constraint for tasks whose interval exists but lacks a covering shift. -fn task_shift_ownership( - name: &'static str, - interval: I, - shift: S, -) -> impl IncrementalConstraint -where - I: Fn(&FurnaceAssignment) -> Option<(usize, usize)> + Send + Sync + 'static, - S: Fn(&FurnaceAssignment) -> Option + Send + Sync + 'static, -{ - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .filter(move |assignment: &FurnaceAssignment| { - interval(assignment).is_some() && shift(assignment).is_none() - }) - .penalize(hard_weight(|_: &FurnaceAssignment| { - HardSoftScore::of_hard(900) - })) - .named(name) -} - -#[cfg(test)] -mod tests { - use super::changeover_shortage; - use crate::constraints::create_constraints; - use crate::data::build_demo_problem; - use crate::domain::calculate_changeover_cost_for_sequence; - use crate::domain::Plan; - use solverforge::ConstraintSet; - use std::collections::HashMap; - - fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { - create_constraints() - .evaluate_each(plan) - .into_iter() - .find(|result| result.name == constraint_name) - .expect("constraint result") - .score - .hard() - } - - fn first_compatible_assignment_plan() -> Plan { - let mut plan = build_demo_problem(); - for assignment in &mut plan.assignments { - assignment.assignment = assignment.compatible_assignments.first().copied(); - } - plan - } - - fn furnace_and_start(value: usize) -> (usize, usize) { - ( - value / crate::domain::NUM_TIME_SLOTS, - (value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP, - ) - } - - fn adjacent_pair(plan: &Plan) -> (usize, usize, usize, usize) { - let by_furnace_start = assignment_values_by_furnace_start(plan); - for left_index in 0..plan.assignments.len() { - for left_value in &plan.assignments[left_index].compatible_assignments { - let (furnace_id, left_start) = furnace_and_start(*left_value); - let right_start = left_start + plan.assignments[left_index].duration_minutes(); - if let Some(candidates) = by_furnace_start.get(&(furnace_id, right_start)) { - if let Some((right_index, right_value)) = candidates - .iter() - .copied() - .find(|(right_index, _)| *right_index != left_index) - { - return (left_index, *left_value, right_index, right_value); - } - } - } - } - panic!("adjacent compatible assignment pair"); - } - - fn same_start_pair(plan: &Plan, same_furnace: bool) -> (usize, usize, usize, usize) { - let by_furnace_start = assignment_values_by_furnace_start(plan); - for entries in by_furnace_start.values() { - if same_furnace && entries.len() >= 2 { - return (entries[0].0, entries[0].1, entries[1].0, entries[1].1); - } - } - if !same_furnace { - let mut by_start: HashMap> = HashMap::new(); - for ((furnace_id, start), entries) in by_furnace_start { - for (assignment_index, value) in entries { - by_start - .entry(start) - .or_default() - .push((furnace_id, assignment_index, value)); - } - } - for entries in by_start.values() { - for left in entries { - for right in entries { - if left.0 != right.0 && left.1 != right.1 { - return (left.1, left.2, right.1, right.2); - } - } - } - } - } - panic!("same-start compatible assignment pair"); - } - - fn assignment_values_by_furnace_start( - plan: &Plan, - ) -> HashMap<(usize, usize), Vec<(usize, usize)>> { - let mut values = HashMap::new(); - for (assignment_index, assignment) in plan.assignments.iter().enumerate() { - for value in &assignment.compatible_assignments { - values - .entry(furnace_and_start(*value)) - .or_insert_with(Vec::new) - .push((assignment_index, *value)); - } - } - values - } - - fn reversed_work_order_changeover_shortage_pair( - plan: &Plan, - ) -> (usize, usize, usize, usize, usize) { - for left_index in 0..plan.assignments.len() { - for right_index in 0..plan.assignments.len() { - if left_index <= right_index { - continue; - } - for left_value in &plan.assignments[left_index].compatible_assignments { - let (left_furnace, left_start) = furnace_and_start(*left_value); - let left_end = left_start + plan.assignments[left_index].duration_minutes(); - for right_value in &plan.assignments[right_index].compatible_assignments { - let (right_furnace, right_start) = furnace_and_start(*right_value); - if left_furnace != right_furnace || left_end > right_start { - continue; - } - - let mut candidate = plan.clone(); - candidate.assignments[left_index].assignment = Some(*left_value); - candidate.assignments[right_index].assignment = Some(*right_value); - let shortage = changeover_shortage( - candidate.assignments[left_index].end_minutes().unwrap(), - candidate.assignments[right_index].start_minutes().unwrap(), - calculate_changeover_cost_for_sequence( - &candidate.assignments[left_index], - &candidate.assignments[right_index], - ) as usize, - ); - if let Some(shortage) = shortage { - return (left_index, *left_value, right_index, *right_value, shortage); - } - } - } - } - } - panic!("reversed work-order changeover shortage pair"); - } - - #[test] - fn generated_assignment_values_do_not_create_incompatible_process_matches() { - let plan = first_compatible_assignment_plan(); - - assert_eq!(hard_score(&plan, "incompatibleProcess"), 0); - } - - #[test] - fn generated_assignment_values_do_not_create_excessive_temperature_matches() { - let plan = first_compatible_assignment_plan(); - - assert_eq!(hard_score(&plan, "excessiveTemperature"), 0); - } - - #[test] - fn generated_assignment_values_do_not_create_excessive_load_matches() { - let plan = first_compatible_assignment_plan(); - - assert_eq!(hard_score(&plan, "excessiveLoad"), 0); - } - - #[test] - fn adjacent_same_furnace_intervals_are_allowed() { - let mut plan = build_demo_problem(); - let (left_index, left_value, right_index, right_value) = adjacent_pair(&plan); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - - assert_eq!(hard_score(&plan, "furnaceOverlap"), 0); - } - - #[test] - fn true_same_furnace_overlap_penalizes_overlap_minutes() { - let mut plan = build_demo_problem(); - let (left_index, left_value, right_index, right_value) = same_start_pair(&plan, true); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - - assert!(hard_score(&plan, "furnaceOverlap") < 0); - } - - #[test] - fn different_furnaces_never_overlap_match() { - let mut plan = build_demo_problem(); - let (left_index, left_value, right_index, right_value) = same_start_pair(&plan, false); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - - assert_eq!(hard_score(&plan, "furnaceOverlap"), 0); - } - - #[test] - fn changeover_gap_uses_temporal_order_not_work_order_order() { - let mut plan = build_demo_problem(); - let (left_index, left_value, right_index, right_value, shortage) = - reversed_work_order_changeover_shortage_pair(&plan); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - - assert_eq!(hard_score(&plan, "changeoverGap"), -(shortage as i64) * 10); - } -} diff --git a/uc-furnace/src/constraints/furnace_overlap.rs b/uc-furnace/src/constraints/furnace_overlap.rs new file mode 100644 index 0000000..63103ad --- /dev/null +++ b/uc-furnace/src/constraints/furnace_overlap.rs @@ -0,0 +1,35 @@ +use super::shared::*; + +/// Penalizes overlapping jobs assigned to the same furnace. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(equal(|assignment: &FurnaceAssignment| { + assignment.furnace_idx() + })) + .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { + if left.work_order_idx >= right.work_order_idx { + return false; + } + let left_start = left.start_minutes().unwrap(); + let left_end = left.end_minutes().unwrap(); + let right_start = right.start_minutes().unwrap(); + let right_end = right.end_minutes().unwrap(); + left_start < right_end && right_start < left_end + }) + .penalize(hard_weight( + |left: &FurnaceAssignment, right: &FurnaceAssignment| { + let overlap_start = left + .start_minutes() + .unwrap() + .max(right.start_minutes().unwrap()); + let overlap_end = left + .end_minutes() + .unwrap() + .min(right.end_minutes().unwrap()); + HardSoftScore::of_hard((overlap_end - overlap_start) as i64 * 20) + }, + )) + .named("furnace_overlap") +} diff --git a/uc-furnace/src/constraints/furnace_soft.rs b/uc-furnace/src/constraints/furnace_soft.rs deleted file mode 100644 index e9a7ac3..0000000 --- a/uc-furnace/src/constraints/furnace_soft.rs +++ /dev/null @@ -1,105 +0,0 @@ -use super::shared::*; - -/// Penalizes late jobs for one priority band using that band's lateness weight. -fn priority_lateness( - name: &'static str, - priority: PriorityBand, - multiplier: i64, -) -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(move |assignment: &FurnaceAssignment| assignment.priority == priority) - .filter(|assignment: &FurnaceAssignment| { - assignment - .end_minutes() - .is_some_and(|end| end > assignment.due_datetime_minutes) - }) - .penalize(move |assignment: &FurnaceAssignment| { - priority_lateness_score( - assignment.end_minutes().unwrap(), - assignment.due_datetime_minutes, - multiplier, - ) - .unwrap() - }) - .named(name) -} - -/// Penalizes express work that finishes after its due time. -pub(super) fn express_lateness() -> impl IncrementalConstraint { - priority_lateness("expressLateness", PriorityBand::Express, 60) -} - -/// Penalizes urgent work that finishes after its due time. -pub(super) fn urgent_lateness() -> impl IncrementalConstraint { - priority_lateness("urgentLateness", PriorityBand::Urgent, 20) -} - -/// Penalizes standard-priority work that finishes after its due time. -pub(super) fn standard_lateness() -> impl IncrementalConstraint { - priority_lateness("standardLateness", PriorityBand::Standard, 5) -} - -/// Penalizes adjacent jobs on the same furnace for thermal changeover cost. -pub(super) fn thermal_changeover() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .join(equal(|assignment: &FurnaceAssignment| { - assignment.furnace_idx() - })) - .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { - left.work_order_idx != right.work_order_idx - && right.start_minutes().unwrap() == left.end_minutes().unwrap() - }) - .penalize(|left: &FurnaceAssignment, right: &FurnaceAssignment| { - HardSoftScore::of_soft(calculate_changeover_cost_for_sequence(left, right) as i64) - }) - .named("thermalChangeover") -} - -/// Penalizes completing work earlier than necessary to reduce early-start pressure. -pub(super) fn early_start_pressure() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| { - assignment - .end_minutes() - .is_some_and(|end| end < assignment.due_datetime_minutes) - }) - .penalize(|assignment: &FurnaceAssignment| { - early_start_pressure_score( - assignment.end_minutes().unwrap(), - assignment.due_datetime_minutes, - ) - .unwrap() - }) - .named("earlyStartPressure") -} - -/// Penalizes non-long-cycle processes that start on night shifts. -pub(super) fn night_start_preference() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) - .filter(|assignment: &FurnaceAssignment| { - assignment - .start_shift_identity() - .is_some_and(|shift| shift.shift_type == ShiftType::Night) - }) - .filter(|assignment: &FurnaceAssignment| { - !matches!( - assignment.process, - crate::domain::HeatTreatmentProcess::Carburizing - | crate::domain::HeatTreatmentProcess::Nitriding - ) - }) - .penalize(|assignment: &FurnaceAssignment| { - HardSoftScore::of_soft(match assignment.priority { - PriorityBand::Express => 40, - PriorityBand::Urgent => 70, - PriorityBand::Standard => 120, - }) - }) - .named("nightStartPreference") -} diff --git a/uc-furnace/src/constraints/incompatible_process.rs b/uc-furnace/src/constraints/incompatible_process.rs new file mode 100644 index 0000000..3f4e272 --- /dev/null +++ b/uc-furnace/src/constraints/incompatible_process.rs @@ -0,0 +1,22 @@ +use super::shared::*; + +/// Penalizes assignments scheduled on furnaces that cannot run the required process. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(( + ConstraintFactory::::new().furnaces(), + equal_bi( + |assignment: &FurnaceAssignment| assignment.furnace_idx(), + |furnace: &Furnace| Some(furnace.id), + ), + )) + .filter(|assignment: &FurnaceAssignment, furnace: &Furnace| { + !furnace.supports_process(assignment.process) + }) + .penalize(hard_weight(|_: &FurnaceAssignment, _: &Furnace| { + HardSoftScore::of_hard(4_000) + })) + .named("incompatible_process") +} diff --git a/uc-furnace/src/constraints/load_build_shift_ownership.rs b/uc-furnace/src/constraints/load_build_shift_ownership.rs new file mode 100644 index 0000000..c668137 --- /dev/null +++ b/uc-furnace/src/constraints/load_build_shift_ownership.rs @@ -0,0 +1,16 @@ +use super::shared::*; + +/// Requires load-build work to be owned by the shift covering that task interval. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .filter(|assignment: &FurnaceAssignment| { + assignment.load_build_interval().is_some() + && assignment.load_build_shift_identity().is_none() + }) + .penalize(hard_weight(|_: &FurnaceAssignment| { + HardSoftScore::of_hard(900) + })) + .named("load_build_shift_ownership") +} diff --git a/uc-furnace/src/constraints/minimum_rest.rs b/uc-furnace/src/constraints/minimum_rest.rs new file mode 100644 index 0000000..92e6792 --- /dev/null +++ b/uc-furnace/src/constraints/minimum_rest.rs @@ -0,0 +1,23 @@ +use super::shared::*; + +/// Requires enough rest time between two shifts worked by the same operator. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .operator_shift_assignments() + .join(equal(|assignment: &OperatorShiftAssignment| { + assignment.operator_idx + })) + .filter( + |previous: &OperatorShiftAssignment, current: &OperatorShiftAssignment| { + has_insufficient_rest(previous, current) + }, + ) + .penalize(hard_weight( + |previous: &OperatorShiftAssignment, current: &OperatorShiftAssignment| { + HardSoftScore::of_hard( + (MINIMUM_REST_MINUTES - shift_rest_minutes(previous, current).unwrap()) as i64, + ) + }, + )) + .named("minimum_rest") +} diff --git a/uc-furnace/src/constraints/mod.rs b/uc-furnace/src/constraints/mod.rs index 1bb3b09..a668a1c 100644 --- a/uc-furnace/src/constraints/mod.rs +++ b/uc-furnace/src/constraints/mod.rs @@ -1,45 +1,41 @@ -mod furnace_hard; -mod furnace_soft; -mod monitoring_hard; -mod roster_hard; -mod roster_soft; -mod shared; -mod staffing_hard; +//! Furnace planning constraints, one module per constraint. + +// @solverforge:begin constraint-modules +mod assigned_tasks_require_scheduled_furnace; +mod changeover_gap; +mod consecutive_nights; +mod day_only_night; +mod early_start_pressure; +mod excessive_load; +mod excessive_temperature; +mod express_lateness; +mod furnace_overlap; +mod incompatible_process; +mod load_build_shift_ownership; +mod minimum_rest; +mod monitoring_capacity; +mod night_start_preference; +mod operator_double_booked; +mod outside_week; +mod overtime; +mod program_shift_ownership; +mod quench_shift_ownership; +mod required_task_assigned; +mod shift_load_balance; +mod shift_role_coverage; +mod standard_lateness; +mod task_operator_on_owning_shift; +mod task_operator_skilled; +mod thermal_changeover; +mod unassigned_orders; +mod unload_shift_ownership; +mod urgent_lateness; +mod visible_shift_limit; +// @solverforge:end constraint-modules -use solverforge::prelude::*; +mod assemble; +mod shared; +#[cfg(test)] +mod tests; -/// Builds the complete furnace planning constraint set. -pub fn create_constraints() -> impl ConstraintSet { - ( - furnace_hard::unassigned_orders(), - furnace_hard::incompatible_process(), - furnace_hard::excessive_temperature(), - furnace_hard::excessive_load(), - furnace_hard::outside_week(), - furnace_hard::furnace_overlap(), - furnace_hard::changeover_gap(), - furnace_hard::load_build_shift_ownership(), - furnace_hard::program_shift_ownership(), - furnace_hard::quench_shift_ownership(), - furnace_hard::unload_shift_ownership(), - staffing_hard::assigned_tasks_require_scheduled_furnace(), - staffing_hard::required_task_assigned(), - staffing_hard::task_operator_skilled(), - staffing_hard::task_operator_on_owning_shift(), - staffing_hard::operator_double_booked(), - staffing_hard::shift_role_coverage(), - monitoring_hard::monitoring_capacity(), - roster_hard::day_only_night(), - roster_hard::minimum_rest(), - roster_hard::visible_shift_limit(), - roster_hard::consecutive_nights(), - furnace_soft::express_lateness(), - furnace_soft::urgent_lateness(), - furnace_soft::standard_lateness(), - furnace_soft::thermal_changeover(), - furnace_soft::early_start_pressure(), - furnace_soft::night_start_preference(), - roster_soft::overtime(), - roster_soft::shift_load_balance(), - ) -} +pub use assemble::create_constraints; diff --git a/uc-furnace/src/constraints/monitoring_capacity.rs b/uc-furnace/src/constraints/monitoring_capacity.rs new file mode 100644 index 0000000..2e195e0 --- /dev/null +++ b/uc-furnace/src/constraints/monitoring_capacity.rs @@ -0,0 +1,28 @@ +use super::shared::*; + +/// Requires enough monitor-capable operator capacity for all active furnace monitoring demand. +pub fn constraint() -> impl IncrementalConstraint { + let factory = ConstraintFactory::::new(); + factory + .assignments() + .project(MonitoringDemandEntries) + .merge( + ConstraintFactory::::new() + .operator_shift_assignments() + .project(OperatorMonitoringCapacityEntries), + ) + .merge( + ConstraintFactory::::new() + .assignments() + .project(AssignedTaskCapacityEntries), + ) + .group_by( + |entry: &MonitoringEntry| entry.bucket, + sum(|entry: &MonitoringEntry| entry.load), + ) + .penalize(hard_weight(|_bucket: &usize, load: &MonitoringLoad| { + let demand = load.required_operators(); + HardSoftScore::of_hard((demand - load.capacity).max(0) * 900) + })) + .named("monitoring_capacity") +} diff --git a/uc-furnace/src/constraints/monitoring_hard.rs b/uc-furnace/src/constraints/monitoring_hard.rs deleted file mode 100644 index d91eed8..0000000 --- a/uc-furnace/src/constraints/monitoring_hard.rs +++ /dev/null @@ -1,154 +0,0 @@ -use super::shared::*; - -/// Requires enough monitor-capable operator capacity for all active furnace monitoring demand. -pub(super) fn monitoring_capacity() -> impl IncrementalConstraint { - let factory = ConstraintFactory::::new(); - factory - .assignments() - .project(MonitoringDemandEntries) - .merge( - ConstraintFactory::::new() - .operator_shift_assignments() - .project(OperatorMonitoringCapacityEntries), - ) - .merge( - ConstraintFactory::::new() - .assignments() - .project(AssignedTaskCapacityEntries), - ) - .group_by( - |entry: &MonitoringEntry| entry.bucket, - sum(|entry: &MonitoringEntry| entry.load), - ) - .penalize(hard_weight(|_bucket: &usize, load: &MonitoringLoad| { - let demand = load.required_operators(); - HardSoftScore::of_hard((demand - load.capacity).max(0) * 900) - })) - .named("monitoringCapacity") -} - -#[cfg(test)] -mod tests { - use crate::constraints::create_constraints; - use crate::data::build_demo_plan; - use crate::domain::{OperatorSkill, Plan}; - use solverforge::ConstraintSet; - - fn monitoring_hard(plan: &Plan) -> i64 { - create_constraints() - .evaluate_each(plan) - .into_iter() - .find(|result| result.name == "monitoringCapacity") - .expect("monitoring constraint result") - .score - .hard() - } - - fn monitoring_score(plan: &Plan) -> i64 { - monitoring_hard(plan) - } - - fn schedule_first_order(plan: &mut Plan) { - let value = plan.assignments[0].compatible_assignments[0]; - plan.assignments[0].assignment = Some(value); - } - - fn assign_monitoring_shift(plan: &mut Plan, assignment_idx: usize, count: usize) { - let shifts = plan.assignments[assignment_idx].occupied_shift_identities(); - assert!( - !shifts.is_empty(), - "scheduled assignment should occupy at least one shift" - ); - - for shift in shifts { - let mut assigned = 0usize; - for assignment in &mut plan.operator_shift_assignments { - if assigned == count { - break; - } - if assignment.roster_day == shift.roster_day - && (assignment.shift_type.is_none() - || assignment.shift_type == Some(shift.shift_type.index())) - && assignment.skill_mask.contains(OperatorSkill::Monitor) - && assignment - .allowed_shift_types - .contains(&shift.shift_type.index()) - { - assignment.shift_type = Some(shift.shift_type.index()); - assigned += 1; - } - } - assert_eq!( - assigned, count, - "demo should have enough monitoring operators" - ); - } - } - - #[test] - fn monitoring_capacity_penalizes_shortage() { - let mut plan = build_demo_plan(); - schedule_first_order(&mut plan); - - assert_ne!(monitoring_score(&plan), 0); - } - - #[test] - fn monitoring_capacity_allows_exact_capacity() { - let mut plan = build_demo_plan(); - schedule_first_order(&mut plan); - assign_monitoring_shift(&mut plan, 0, 2); - - assert_eq!(monitoring_score(&plan), 0); - } - - #[test] - fn monitoring_capacity_allows_surplus_capacity() { - let mut plan = build_demo_plan(); - schedule_first_order(&mut plan); - assign_monitoring_shift(&mut plan, 0, 3); - - assert_eq!(monitoring_score(&plan), 0); - } - - #[test] - fn monitoring_capacity_counts_manual_task_consumption() { - let base = build_demo_plan(); - - for assignment_idx in 0..base.assignments.len() { - for capacity in 1..=3 { - let mut plan = base.clone(); - plan.assignments[assignment_idx].assignment = plan.assignments[assignment_idx] - .compatible_assignments - .first() - .copied(); - assign_monitoring_shift(&mut plan, assignment_idx, capacity); - if monitoring_score(&plan) != 0 { - continue; - } - - plan.assignments[assignment_idx].load_build_operator_id = plan.assignments - [assignment_idx] - .eligible_load_build_operator_ids - .first() - .copied(); - if monitoring_score(&plan) != 0 { - return; - } - } - } - - panic!("demo should contain a schedule where manual task consumption creates shortage"); - } - - #[test] - fn monitoring_capacity_retracts_updated_assignment() { - let mut plan = build_demo_plan(); - schedule_first_order(&mut plan); - assert_ne!(monitoring_hard(&plan), 0); - - plan.assignments[0].assignment = None; - - assert_eq!(monitoring_hard(&plan), 0); - } -} diff --git a/uc-furnace/src/constraints/night_start_preference.rs b/uc-furnace/src/constraints/night_start_preference.rs new file mode 100644 index 0000000..089ff85 --- /dev/null +++ b/uc-furnace/src/constraints/night_start_preference.rs @@ -0,0 +1,28 @@ +use super::shared::*; + +/// Penalizes non-long-cycle processes that start on night shifts. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .filter(|assignment: &FurnaceAssignment| { + assignment + .start_shift_identity() + .is_some_and(|shift| shift.shift_type == ShiftType::Night) + }) + .filter(|assignment: &FurnaceAssignment| { + !matches!( + assignment.process, + crate::domain::HeatTreatmentProcess::Carburizing + | crate::domain::HeatTreatmentProcess::Nitriding + ) + }) + .penalize(|assignment: &FurnaceAssignment| { + HardSoftScore::of_soft(match assignment.priority { + PriorityBand::Express => 40, + PriorityBand::Urgent => 70, + PriorityBand::Standard => 120, + }) + }) + .named("night_start_preference") +} diff --git a/uc-furnace/src/constraints/operator_double_booked.rs b/uc-furnace/src/constraints/operator_double_booked.rs new file mode 100644 index 0000000..ed0b60f --- /dev/null +++ b/uc-furnace/src/constraints/operator_double_booked.rs @@ -0,0 +1,18 @@ +use super::shared::*; + +/// Prevents an operator from being assigned to overlapping manual tasks. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .project(ManualTaskBookingEntries) + .join(equal(|booking: &ManualTaskBooking| booking.operator_id)) + .filter(|left: &ManualTaskBooking, right: &ManualTaskBooking| { + left.identity_key() < right.identity_key() && left.overlaps(right) + }) + .penalize(hard_weight( + |left: &ManualTaskBooking, right: &ManualTaskBooking| { + HardSoftScore::of_hard(booking_overlap_minutes(left, right) as i64 * 900) + }, + )) + .named("operator_double_booked") +} diff --git a/uc-furnace/src/constraints/outside_week.rs b/uc-furnace/src/constraints/outside_week.rs new file mode 100644 index 0000000..f8671e2 --- /dev/null +++ b/uc-furnace/src/constraints/outside_week.rs @@ -0,0 +1,16 @@ +use super::shared::*; + +/// Penalizes scheduled work that finishes beyond the weekly planning horizon. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| { + assignment + .end_minutes() + .is_some_and(|end| end > HORIZON_MINUTES) + }) + .penalize(hard_weight(|assignment: &FurnaceAssignment| { + HardSoftScore::of_hard((assignment.end_minutes().unwrap() - HORIZON_MINUTES) as i64 * 5) + })) + .named("outside_week") +} diff --git a/uc-furnace/src/constraints/roster_soft.rs b/uc-furnace/src/constraints/overtime.rs similarity index 52% rename from uc-furnace/src/constraints/roster_soft.rs rename to uc-furnace/src/constraints/overtime.rs index 1604c35..e7fb43d 100644 --- a/uc-furnace/src/constraints/roster_soft.rs +++ b/uc-furnace/src/constraints/overtime.rs @@ -1,7 +1,7 @@ use super::shared::*; /// Penalizes operators who exceed the target number of visible weekly shifts. -pub(super) fn overtime() -> impl IncrementalConstraint { +pub fn constraint() -> impl IncrementalConstraint { ConstraintFactory::::new() .operator_shift_assignments() .filter(|assignment: &OperatorShiftAssignment| { @@ -18,15 +18,3 @@ pub(super) fn overtime() -> impl IncrementalConstraint { }) .named("overtime") } - -/// Penalizes uneven distribution of working shifts across operators. -pub(super) fn shift_load_balance() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .operator_shift_assignments() - .filter(|assignment: &OperatorShiftAssignment| { - assignment.roster_day >= 0 && assignment.is_working() - }) - .balance(|assignment: &OperatorShiftAssignment| Some(assignment.operator_idx)) - .penalize(HardSoftScore::of_soft(120)) - .named("shiftLoadBalance") -} diff --git a/uc-furnace/src/constraints/program_shift_ownership.rs b/uc-furnace/src/constraints/program_shift_ownership.rs new file mode 100644 index 0000000..f0d8987 --- /dev/null +++ b/uc-furnace/src/constraints/program_shift_ownership.rs @@ -0,0 +1,15 @@ +use super::shared::*; + +/// Requires programming work to be owned by the shift covering that task interval. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .filter(|assignment: &FurnaceAssignment| { + assignment.program_interval().is_some() && assignment.program_shift_identity().is_none() + }) + .penalize(hard_weight(|_: &FurnaceAssignment| { + HardSoftScore::of_hard(900) + })) + .named("program_shift_ownership") +} diff --git a/uc-furnace/src/constraints/quench_shift_ownership.rs b/uc-furnace/src/constraints/quench_shift_ownership.rs new file mode 100644 index 0000000..d585de9 --- /dev/null +++ b/uc-furnace/src/constraints/quench_shift_ownership.rs @@ -0,0 +1,15 @@ +use super::shared::*; + +/// Requires quench work to be owned by the shift covering that task interval. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .filter(|assignment: &FurnaceAssignment| { + assignment.quench_interval().is_some() && assignment.quench_shift_identity().is_none() + }) + .penalize(hard_weight(|_: &FurnaceAssignment| { + HardSoftScore::of_hard(900) + })) + .named("quench_shift_ownership") +} diff --git a/uc-furnace/src/constraints/required_task_assigned.rs b/uc-furnace/src/constraints/required_task_assigned.rs new file mode 100644 index 0000000..caba075 --- /dev/null +++ b/uc-furnace/src/constraints/required_task_assigned.rs @@ -0,0 +1,12 @@ +use super::shared::*; + +/// Requires every mandatory manual task on a scheduled job to have an operator assigned. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .project(MissingTaskOperatorViolations) + .penalize(hard_weight(|violation: &HardViolation| { + HardSoftScore::of_hard(violation.weight) + })) + .named("required_task_assigned") +} diff --git a/uc-furnace/src/constraints/roster_hard.rs b/uc-furnace/src/constraints/roster_hard.rs deleted file mode 100644 index 08d41b4..0000000 --- a/uc-furnace/src/constraints/roster_hard.rs +++ /dev/null @@ -1,120 +0,0 @@ -use super::shared::*; - -/// Prevents day-only operators from being assigned to night shifts. -pub(super) fn day_only_night() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .operator_shift_assignments() - .filter(|assignment: &OperatorShiftAssignment| { - assignment.day_only && assignment.shift_type_enum() == Some(ShiftType::Night) - }) - .penalize(hard_weight(|_: &OperatorShiftAssignment| { - HardSoftScore::of_hard(1_200) - })) - .named("dayOnlyNight") -} - -/// Requires enough rest time between two shifts worked by the same operator. -pub(super) fn minimum_rest() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .operator_shift_assignments() - .join(equal(|assignment: &OperatorShiftAssignment| { - assignment.operator_idx - })) - .filter( - |previous: &OperatorShiftAssignment, current: &OperatorShiftAssignment| { - has_insufficient_rest(previous, current) - }, - ) - .penalize(hard_weight( - |previous: &OperatorShiftAssignment, current: &OperatorShiftAssignment| { - HardSoftScore::of_hard( - (MINIMUM_REST_MINUTES - shift_rest_minutes(previous, current).unwrap()) as i64, - ) - }, - )) - .named("minimumRest") -} - -/// Caps the number of visible roster shifts an operator may work in the week. -pub(super) fn visible_shift_limit() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .operator_shift_assignments() - .filter(|assignment: &OperatorShiftAssignment| { - assignment.roster_day >= 0 && assignment.is_working() - }) - .group_by( - |assignment: &OperatorShiftAssignment| assignment.operator_idx, - count(), - ) - .penalize(hard_weight( - |_operator_idx: &usize, visible_shifts: &usize| { - HardSoftScore::of_hard( - visible_shifts.saturating_sub(MAX_VISIBLE_SHIFTS_PER_WEEK) as i64 * 900, - ) - }, - )) - .named("visibleShiftLimit") -} - -/// Caps consecutive night-shift windows for each operator. -pub(super) fn consecutive_nights() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .operator_shift_assignments() - .project(OperatorNightWindowEntries) - .group_by( - |entry: &NightWindowEntry| (entry.operator_id, entry.window_start_day), - sum(|entry: &NightWindowEntry| entry.delta), - ) - .penalize(hard_weight(|_window: &(usize, i32), night_shifts: &i64| { - HardSoftScore::of_hard((*night_shifts - MAX_CONSECUTIVE_NIGHTS as i64).max(0) * 900) - })) - .named("consecutiveNights") -} - -#[cfg(test)] -mod tests { - use crate::constraints::create_constraints; - use crate::data::build_demo_plan; - use crate::domain::{Plan, ShiftType}; - use solverforge::ConstraintSet; - - fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { - create_constraints() - .evaluate_each(plan) - .into_iter() - .find(|result| result.name == constraint_name) - .expect("constraint result") - .score - .hard() - } - - #[test] - fn adjacent_night_run_within_policy_is_allowed() { - let mut plan = build_demo_plan(); - for day in 1..=3 { - let assignment = plan - .operator_shift_assignments - .iter_mut() - .find(|assignment| assignment.operator_idx == 0 && assignment.roster_day == day) - .expect("operator day assignment"); - assignment.shift_type = Some(ShiftType::Night.index()); - } - - assert_eq!(hard_score(&plan, "consecutiveNights"), 0); - } - - #[test] - fn night_count_beyond_policy_is_hard_penalized() { - let mut plan = build_demo_plan(); - for day in 1..=4 { - let assignment = plan - .operator_shift_assignments - .iter_mut() - .find(|assignment| assignment.operator_idx == 0 && assignment.roster_day == day) - .expect("operator day assignment"); - assignment.shift_type = Some(ShiftType::Night.index()); - } - - assert!(hard_score(&plan, "consecutiveNights") < 0); - } -} diff --git a/uc-furnace/src/constraints/shared.rs b/uc-furnace/src/constraints/shared.rs index 3d215bc..0b0ce73 100644 --- a/uc-furnace/src/constraints/shared.rs +++ b/uc-furnace/src/constraints/shared.rs @@ -44,3 +44,44 @@ pub(super) fn early_start_pressure_score( (end_minutes < due_datetime_minutes) .then(|| HardSoftScore::of_soft(((due_datetime_minutes - end_minutes) as i64) / 40)) } + +pub(super) fn assignment_uses_operator( + assignment: &FurnaceAssignment, + operator: &Operator, +) -> bool { + [ + assignment.load_build_operator_id, + assignment.program_operator_id, + assignment.quench_operator_id, + assignment.unload_operator_id, + ] + .into_iter() + .any(|operator_id| operator_id == Some(operator.id)) +} + +pub(super) fn invalid_skill_count(assignment: &FurnaceAssignment, operator: &Operator) -> usize { + [ + (ManualTaskKind::LoadBuild, assignment.load_build_operator_id), + (ManualTaskKind::Program, assignment.program_operator_id), + (ManualTaskKind::Quench, assignment.quench_operator_id), + (assignment.unload_task_kind(), assignment.unload_operator_id), + ] + .into_iter() + .filter(|(kind, operator_id)| { + *operator_id == Some(operator.id) + && assignment.task_interval(*kind).is_some() + && !operator + .skill_mask + .contains_all(assignment.task_required_skills(*kind)) + }) + .count() +} + +pub(super) fn booking_overlap_minutes( + left: &ManualTaskBooking, + right: &ManualTaskBooking, +) -> usize { + left.end_minute + .min(right.end_minute) + .saturating_sub(left.start_minute.max(right.start_minute)) +} diff --git a/uc-furnace/src/constraints/shift_load_balance.rs b/uc-furnace/src/constraints/shift_load_balance.rs new file mode 100644 index 0000000..dd75679 --- /dev/null +++ b/uc-furnace/src/constraints/shift_load_balance.rs @@ -0,0 +1,13 @@ +use super::shared::*; + +/// Penalizes uneven distribution of working shifts across operators. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .operator_shift_assignments() + .filter(|assignment: &OperatorShiftAssignment| { + assignment.roster_day >= 0 && assignment.is_working() + }) + .balance(|assignment: &OperatorShiftAssignment| Some(assignment.operator_idx)) + .penalize(HardSoftScore::of_soft(120)) + .named("shift_load_balance") +} diff --git a/uc-furnace/src/constraints/shift_role_coverage.rs b/uc-furnace/src/constraints/shift_role_coverage.rs new file mode 100644 index 0000000..0e96067 --- /dev/null +++ b/uc-furnace/src/constraints/shift_role_coverage.rs @@ -0,0 +1,23 @@ +use super::shared::*; + +/// Requires each shift to meet its configured role coverage demand. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .shift_coverage_demands() + .project(ShiftCoverageEntries) + .merge( + ConstraintFactory::::new() + .operator_shift_assignments() + .project(OperatorShiftCoverageEntries), + ) + .group_by( + |entry: &ShiftCoverageEntry| (entry.shift_id, entry.role), + sum(|entry: &ShiftCoverageEntry| entry.delta), + ) + .penalize(hard_weight( + |_key: &(usize, OperatorRole), shortage: &i64| { + HardSoftScore::of_hard((*shortage).max(0) * 900) + }, + )) + .named("shift_role_coverage") +} diff --git a/uc-furnace/src/constraints/staffing_hard.rs b/uc-furnace/src/constraints/staffing_hard.rs deleted file mode 100644 index 17a28dc..0000000 --- a/uc-furnace/src/constraints/staffing_hard.rs +++ /dev/null @@ -1,339 +0,0 @@ -use super::shared::*; - -/// Requires manual task assignments to reference a scheduled furnace job. -pub(super) fn assigned_tasks_require_scheduled_furnace( -) -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .project(AssignedTaskWithoutScheduleViolations) - .penalize(hard_weight(|violation: &HardViolation| { - HardSoftScore::of_hard(violation.weight) - })) - .named("assignedTasksRequireScheduledFurnace") -} - -/// Requires every mandatory manual task on a scheduled job to have an operator assigned. -pub(super) fn required_task_assigned() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .project(MissingTaskOperatorViolations) - .penalize(hard_weight(|violation: &HardViolation| { - HardSoftScore::of_hard(violation.weight) - })) - .named("requiredTaskAssigned") -} - -/// Requires assigned task operators to hold the skills needed for their manual tasks. -pub(super) fn task_operator_skilled() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .join(( - ConstraintFactory::::new().operators(), - assignment_uses_operator, - )) - .filter(|assignment: &FurnaceAssignment, operator: &Operator| { - invalid_skill_count(assignment, operator) > 0 - }) - .penalize(hard_weight( - |assignment: &FurnaceAssignment, operator: &Operator| { - HardSoftScore::of_hard(invalid_skill_count(assignment, operator) as i64 * 900) - }, - )) - .named("taskOperatorSkilled") -} - -/// Requires assigned task operators to be rostered on the shift that owns the task. -pub(super) fn task_operator_on_owning_shift() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .project(TaskShiftWorkEntries) - .merge( - ConstraintFactory::::new() - .operator_shift_assignments() - .project(OperatorTaskShiftWorkEntries), - ) - .group_by( - |entry: &ShiftWorkEntry| (entry.operator_id, entry.shift_id), - sum(|entry: &ShiftWorkEntry| entry.delta), - ) - .penalize(hard_weight(|_key: &(usize, usize), shortage: &i64| { - HardSoftScore::of_hard((*shortage).max(0) * 900) - })) - .named("taskOperatorOnOwningShift") -} - -/// Prevents an operator from being assigned to overlapping manual tasks. -pub(super) fn operator_double_booked() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .assignments() - .project(ManualTaskBookingEntries) - .join(equal(|booking: &ManualTaskBooking| booking.operator_id)) - .filter(|left: &ManualTaskBooking, right: &ManualTaskBooking| { - left.identity_key() < right.identity_key() && left.overlaps(right) - }) - .penalize(hard_weight( - |left: &ManualTaskBooking, right: &ManualTaskBooking| { - HardSoftScore::of_hard(booking_overlap_minutes(left, right) as i64 * 900) - }, - )) - .named("operatorDoubleBooked") -} - -/// Requires each shift to meet its configured role coverage demand. -pub(super) fn shift_role_coverage() -> impl IncrementalConstraint { - ConstraintFactory::::new() - .shift_coverage_demands() - .project(ShiftCoverageEntries) - .merge( - ConstraintFactory::::new() - .operator_shift_assignments() - .project(OperatorShiftCoverageEntries), - ) - .group_by( - |entry: &ShiftCoverageEntry| (entry.shift_id, entry.role), - sum(|entry: &ShiftCoverageEntry| entry.delta), - ) - .penalize(hard_weight( - |_key: &(usize, OperatorRole), shortage: &i64| { - HardSoftScore::of_hard((*shortage).max(0) * 900) - }, - )) - .named("shiftRoleCoverage") -} - -fn assignment_uses_operator(assignment: &FurnaceAssignment, operator: &Operator) -> bool { - [ - assignment.load_build_operator_id, - assignment.program_operator_id, - assignment.quench_operator_id, - assignment.unload_operator_id, - ] - .into_iter() - .any(|operator_id| operator_id == Some(operator.id)) -} - -fn invalid_skill_count(assignment: &FurnaceAssignment, operator: &Operator) -> usize { - [ - (ManualTaskKind::LoadBuild, assignment.load_build_operator_id), - (ManualTaskKind::Program, assignment.program_operator_id), - (ManualTaskKind::Quench, assignment.quench_operator_id), - (assignment.unload_task_kind(), assignment.unload_operator_id), - ] - .into_iter() - .filter(|(kind, operator_id)| { - *operator_id == Some(operator.id) - && assignment.task_interval(*kind).is_some() - && !operator - .skill_mask - .contains_all(assignment.task_required_skills(*kind)) - }) - .count() -} - -fn booking_overlap_minutes(left: &ManualTaskBooking, right: &ManualTaskBooking) -> usize { - left.end_minute - .min(right.end_minute) - .saturating_sub(left.start_minute.max(right.start_minute)) -} - -#[cfg(test)] -mod tests { - use crate::constraints::create_constraints; - use crate::data::build_demo_plan; - use crate::domain::{ManualTaskKind, OperatorRole, Plan, RosterDay, ShiftType}; - use solverforge::ConstraintSet; - use std::collections::HashMap; - - fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { - create_constraints() - .evaluate_each(plan) - .into_iter() - .find(|result| result.name == constraint_name) - .expect("constraint result") - .score - .hard() - } - - fn assign_role_count(plan: &mut Plan, shift_id: usize, role: OperatorRole, count: usize) { - let shift = plan.shifts[shift_id].identity(); - let mut assigned = 0usize; - for assignment in &mut plan.operator_shift_assignments { - if assigned == count { - break; - } - if assignment.role == role - && assignment.roster_day == shift.roster_day - && assignment.shift_type.is_none() - && assignment - .allowed_shift_types - .contains(&shift.shift_type.index()) - { - assignment.shift_type = Some(shift.shift_type.index()); - assigned += 1; - } - } - assert_eq!(assigned, count); - } - - fn schedule_operator_on_shift(plan: &mut Plan, operator_id: usize, shift_id: usize) { - let shift = plan.shifts[shift_id].identity(); - let assignment = plan - .operator_shift_assignments - .iter_mut() - .find(|assignment| { - assignment.operator_idx == operator_id - && assignment.roster_day == shift.roster_day - && assignment - .allowed_shift_types - .contains(&shift.shift_type.index()) - }) - .expect("operator shift assignment"); - assert!( - assignment.shift_type.is_none() - || assignment.shift_type == Some(shift.shift_type.index()), - "operator cannot be assigned to two shift types on the same roster day" - ); - assignment.shift_type = Some(shift.shift_type.index()); - } - - fn pick_operator_for_task_shift( - plan: &Plan, - kind: ManualTaskKind, - rostered: &HashMap<(usize, RosterDay), ShiftType>, - ) -> usize { - let shift = plan.assignments[0] - .task_shift_identity(kind) - .expect("task shift"); - plan.assignments[0] - .task_eligible_operator_ids(kind) - .iter() - .copied() - .find(|operator_id| { - rostered - .get(&(*operator_id, shift.roster_day)) - .is_none_or(|assigned_shift| *assigned_shift == shift.shift_type) - }) - .expect("eligible operator without conflicting roster-day shift") - } - - fn value_with_start( - assignment: &crate::domain::FurnaceAssignment, - start: usize, - ) -> Option { - assignment - .compatible_assignments - .iter() - .copied() - .find(|value| { - (value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP == start - }) - } - - fn load_build_pair_with_start_delta(plan: &Plan, delta: usize) -> (usize, usize, usize, usize) { - for left_index in 0..plan.assignments.len() { - for right_index in (left_index + 1)..plan.assignments.len() { - for left_value in &plan.assignments[left_index].compatible_assignments { - let left_start = - (left_value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP; - if left_start < 60 { - continue; - } - let right_start = left_start + delta; - if let Some(right_value) = - value_with_start(&plan.assignments[right_index], right_start) - { - return (left_index, *left_value, right_index, right_value); - } - } - } - } - panic!("load-build pair with start delta {delta}"); - } - - #[test] - fn shift_role_coverage_penalizes_missing_required_crew() { - let plan = build_demo_plan(); - - assert!(hard_score(&plan, "shiftRoleCoverage") < 0); - } - - #[test] - fn shift_role_coverage_allows_exact_required_crew() { - let mut plan = build_demo_plan(); - let demands = plan.shift_coverage_demands.clone(); - for demand in demands { - assign_role_count( - &mut plan, - demand.shift_id, - demand.role, - demand.required_count as usize, - ); - } - - assert_eq!(hard_score(&plan, "shiftRoleCoverage"), 0); - } - - #[test] - fn task_operator_on_owning_shift_allows_task_operator_working_that_shift() { - let mut plan = build_demo_plan(); - let value = plan.assignments[0].compatible_assignments[0]; - plan.assignments[0].assignment = Some(value); - - let mut rostered = HashMap::new(); - let task_kinds = plan.assignments[0].required_task_kinds(); - for kind in task_kinds { - let shift = plan.assignments[0] - .task_shift_identity(kind) - .expect("task shift"); - let operator_id = pick_operator_for_task_shift(&plan, kind, &rostered); - match kind { - ManualTaskKind::LoadBuild => { - plan.assignments[0].load_build_operator_id = Some(operator_id) - } - ManualTaskKind::Program => { - plan.assignments[0].program_operator_id = Some(operator_id) - } - ManualTaskKind::Quench => { - plan.assignments[0].quench_operator_id = Some(operator_id) - } - ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => { - plan.assignments[0].unload_operator_id = Some(operator_id) - } - } - let shift_id = plan.assignments[0] - .task_shift_identity(kind) - .expect("task shift") - .shift_id; - schedule_operator_on_shift(&mut plan, operator_id, shift_id); - rostered.insert((operator_id, shift.roster_day), shift.shift_type); - } - - assert_eq!(hard_score(&plan, "taskOperatorOnOwningShift"), 0); - } - - #[test] - fn operator_double_booked_penalizes_actual_overlap_minutes_once() { - let mut plan = build_demo_plan(); - let (left_index, left_value, right_index, right_value) = - load_build_pair_with_start_delta(&plan, 15); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - plan.assignments[left_index].load_build_operator_id = Some(0); - plan.assignments[right_index].load_build_operator_id = Some(0); - - assert_eq!(hard_score(&plan, "operatorDoubleBooked"), -13_500); - } - - #[test] - fn operator_double_booked_allows_touching_manual_task_intervals() { - let mut plan = build_demo_plan(); - let (left_index, left_value, right_index, right_value) = - load_build_pair_with_start_delta(&plan, 30); - plan.assignments[left_index].assignment = Some(left_value); - plan.assignments[right_index].assignment = Some(right_value); - plan.assignments[left_index].load_build_operator_id = Some(0); - plan.assignments[right_index].load_build_operator_id = Some(0); - - assert_eq!(hard_score(&plan, "operatorDoubleBooked"), 0); - } -} diff --git a/uc-furnace/src/constraints/standard_lateness.rs b/uc-furnace/src/constraints/standard_lateness.rs new file mode 100644 index 0000000..a37b2b9 --- /dev/null +++ b/uc-furnace/src/constraints/standard_lateness.rs @@ -0,0 +1,22 @@ +use super::shared::*; + +/// Penalizes standard-priority work that finishes after its due time. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.priority == PriorityBand::Standard) + .filter(|assignment: &FurnaceAssignment| { + assignment + .end_minutes() + .is_some_and(|end| end > assignment.due_datetime_minutes) + }) + .penalize(|assignment: &FurnaceAssignment| { + priority_lateness_score( + assignment.end_minutes().unwrap(), + assignment.due_datetime_minutes, + 5, + ) + .unwrap() + }) + .named("standard_lateness") +} diff --git a/uc-furnace/src/constraints/task_operator_on_owning_shift.rs b/uc-furnace/src/constraints/task_operator_on_owning_shift.rs new file mode 100644 index 0000000..15a8e47 --- /dev/null +++ b/uc-furnace/src/constraints/task_operator_on_owning_shift.rs @@ -0,0 +1,21 @@ +use super::shared::*; + +/// Requires assigned task operators to be rostered on the shift that owns the task. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .project(TaskShiftWorkEntries) + .merge( + ConstraintFactory::::new() + .operator_shift_assignments() + .project(OperatorTaskShiftWorkEntries), + ) + .group_by( + |entry: &ShiftWorkEntry| (entry.operator_id, entry.shift_id), + sum(|entry: &ShiftWorkEntry| entry.delta), + ) + .penalize(hard_weight(|_key: &(usize, usize), shortage: &i64| { + HardSoftScore::of_hard((*shortage).max(0) * 900) + })) + .named("task_operator_on_owning_shift") +} diff --git a/uc-furnace/src/constraints/task_operator_skilled.rs b/uc-furnace/src/constraints/task_operator_skilled.rs new file mode 100644 index 0000000..c29035e --- /dev/null +++ b/uc-furnace/src/constraints/task_operator_skilled.rs @@ -0,0 +1,20 @@ +use super::shared::*; + +/// Requires assigned task operators to hold the skills needed for their manual tasks. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .join(( + ConstraintFactory::::new().operators(), + assignment_uses_operator, + )) + .filter(|assignment: &FurnaceAssignment, operator: &Operator| { + invalid_skill_count(assignment, operator) > 0 + }) + .penalize(hard_weight( + |assignment: &FurnaceAssignment, operator: &Operator| { + HardSoftScore::of_hard(invalid_skill_count(assignment, operator) as i64 * 900) + }, + )) + .named("task_operator_skilled") +} diff --git a/uc-furnace/src/constraints/tests.rs b/uc-furnace/src/constraints/tests.rs new file mode 100644 index 0000000..1e8f767 --- /dev/null +++ b/uc-furnace/src/constraints/tests.rs @@ -0,0 +1,4 @@ +mod furnace_hard; +mod monitoring_hard; +mod roster_hard; +mod staffing_hard; diff --git a/uc-furnace/src/constraints/tests/furnace_hard.rs b/uc-furnace/src/constraints/tests/furnace_hard.rs new file mode 100644 index 0000000..76b4901 --- /dev/null +++ b/uc-furnace/src/constraints/tests/furnace_hard.rs @@ -0,0 +1,195 @@ +use crate::constraints::create_constraints; +use crate::constraints::shared::changeover_shortage; +use crate::data::build_demo_problem; +use crate::domain::calculate_changeover_cost_for_sequence; +use crate::domain::Plan; +use solverforge::ConstraintSet; +use std::collections::HashMap; + +fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { + create_constraints() + .evaluate_each(plan) + .into_iter() + .find(|result| result.name == constraint_name) + .expect("constraint result") + .score + .hard() +} + +fn first_compatible_assignment_plan() -> Plan { + let mut plan = build_demo_problem(); + for assignment in &mut plan.assignments { + assignment.assignment = assignment.compatible_assignments.first().copied(); + } + plan +} + +fn furnace_and_start(value: usize) -> (usize, usize) { + ( + value / crate::domain::NUM_TIME_SLOTS, + (value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP, + ) +} + +fn adjacent_pair(plan: &Plan) -> (usize, usize, usize, usize) { + let by_furnace_start = assignment_values_by_furnace_start(plan); + for left_index in 0..plan.assignments.len() { + for left_value in &plan.assignments[left_index].compatible_assignments { + let (furnace_id, left_start) = furnace_and_start(*left_value); + let right_start = left_start + plan.assignments[left_index].duration_minutes(); + if let Some(candidates) = by_furnace_start.get(&(furnace_id, right_start)) { + if let Some((right_index, right_value)) = candidates + .iter() + .copied() + .find(|(right_index, _)| *right_index != left_index) + { + return (left_index, *left_value, right_index, right_value); + } + } + } + } + panic!("adjacent compatible assignment pair"); +} + +fn same_start_pair(plan: &Plan, same_furnace: bool) -> (usize, usize, usize, usize) { + let by_furnace_start = assignment_values_by_furnace_start(plan); + for entries in by_furnace_start.values() { + if same_furnace && entries.len() >= 2 { + return (entries[0].0, entries[0].1, entries[1].0, entries[1].1); + } + } + if !same_furnace { + let mut by_start: HashMap> = HashMap::new(); + for ((furnace_id, start), entries) in by_furnace_start { + for (assignment_index, value) in entries { + by_start + .entry(start) + .or_default() + .push((furnace_id, assignment_index, value)); + } + } + for entries in by_start.values() { + for left in entries { + for right in entries { + if left.0 != right.0 && left.1 != right.1 { + return (left.1, left.2, right.1, right.2); + } + } + } + } + } + panic!("same-start compatible assignment pair"); +} + +fn assignment_values_by_furnace_start(plan: &Plan) -> HashMap<(usize, usize), Vec<(usize, usize)>> { + let mut values = HashMap::new(); + for (assignment_index, assignment) in plan.assignments.iter().enumerate() { + for value in &assignment.compatible_assignments { + values + .entry(furnace_and_start(*value)) + .or_insert_with(Vec::new) + .push((assignment_index, *value)); + } + } + values +} + +fn reversed_work_order_changeover_shortage_pair( + plan: &Plan, +) -> (usize, usize, usize, usize, usize) { + for left_index in 0..plan.assignments.len() { + for right_index in 0..plan.assignments.len() { + if left_index <= right_index { + continue; + } + for left_value in &plan.assignments[left_index].compatible_assignments { + let (left_furnace, left_start) = furnace_and_start(*left_value); + let left_end = left_start + plan.assignments[left_index].duration_minutes(); + for right_value in &plan.assignments[right_index].compatible_assignments { + let (right_furnace, right_start) = furnace_and_start(*right_value); + if left_furnace != right_furnace || left_end > right_start { + continue; + } + + let mut candidate = plan.clone(); + candidate.assignments[left_index].assignment = Some(*left_value); + candidate.assignments[right_index].assignment = Some(*right_value); + let shortage = changeover_shortage( + candidate.assignments[left_index].end_minutes().unwrap(), + candidate.assignments[right_index].start_minutes().unwrap(), + calculate_changeover_cost_for_sequence( + &candidate.assignments[left_index], + &candidate.assignments[right_index], + ) as usize, + ); + if let Some(shortage) = shortage { + return (left_index, *left_value, right_index, *right_value, shortage); + } + } + } + } + } + panic!("reversed work-order changeover shortage pair"); +} + +#[test] +fn generated_assignment_values_do_not_create_incompatible_process_matches() { + let plan = first_compatible_assignment_plan(); + + assert_eq!(hard_score(&plan, "incompatible_process"), 0); +} + +#[test] +fn generated_assignment_values_do_not_create_excessive_temperature_matches() { + let plan = first_compatible_assignment_plan(); + + assert_eq!(hard_score(&plan, "excessive_temperature"), 0); +} + +#[test] +fn generated_assignment_values_do_not_create_excessive_load_matches() { + let plan = first_compatible_assignment_plan(); + + assert_eq!(hard_score(&plan, "excessive_load"), 0); +} + +#[test] +fn adjacent_same_furnace_intervals_are_allowed() { + let mut plan = build_demo_problem(); + let (left_index, left_value, right_index, right_value) = adjacent_pair(&plan); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + + assert_eq!(hard_score(&plan, "furnace_overlap"), 0); +} + +#[test] +fn true_same_furnace_overlap_penalizes_overlap_minutes() { + let mut plan = build_demo_problem(); + let (left_index, left_value, right_index, right_value) = same_start_pair(&plan, true); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + + assert!(hard_score(&plan, "furnace_overlap") < 0); +} + +#[test] +fn different_furnaces_never_overlap_match() { + let mut plan = build_demo_problem(); + let (left_index, left_value, right_index, right_value) = same_start_pair(&plan, false); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + + assert_eq!(hard_score(&plan, "furnace_overlap"), 0); +} + +#[test] +fn changeover_gap_uses_temporal_order_not_work_order_order() { + let mut plan = build_demo_problem(); + let (left_index, left_value, right_index, right_value, shortage) = + reversed_work_order_changeover_shortage_pair(&plan); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + + assert_eq!(hard_score(&plan, "changeover_gap"), -(shortage as i64) * 10); +} diff --git a/uc-furnace/src/constraints/tests/monitoring_hard.rs b/uc-furnace/src/constraints/tests/monitoring_hard.rs new file mode 100644 index 0000000..2405e69 --- /dev/null +++ b/uc-furnace/src/constraints/tests/monitoring_hard.rs @@ -0,0 +1,122 @@ +use crate::constraints::create_constraints; +use crate::data::build_demo_plan; +use crate::domain::{OperatorSkill, Plan}; +use solverforge::ConstraintSet; + +fn monitoring_hard(plan: &Plan) -> i64 { + create_constraints() + .evaluate_each(plan) + .into_iter() + .find(|result| result.name == "monitoring_capacity") + .expect("monitoring constraint result") + .score + .hard() +} + +fn monitoring_score(plan: &Plan) -> i64 { + monitoring_hard(plan) +} + +fn schedule_first_order(plan: &mut Plan) { + let value = plan.assignments[0].compatible_assignments[0]; + plan.assignments[0].assignment = Some(value); +} + +fn assign_monitoring_shift(plan: &mut Plan, assignment_idx: usize, count: usize) { + let shifts = plan.assignments[assignment_idx].occupied_shift_identities(); + assert!( + !shifts.is_empty(), + "scheduled assignment should occupy at least one shift" + ); + + for shift in shifts { + let mut assigned = 0usize; + for assignment in &mut plan.operator_shift_assignments { + if assigned == count { + break; + } + if assignment.roster_day == shift.roster_day + && (assignment.shift_type.is_none() + || assignment.shift_type == Some(shift.shift_type.index())) + && assignment.skill_mask.contains(OperatorSkill::Monitor) + && assignment + .allowed_shift_types + .contains(&shift.shift_type.index()) + { + assignment.shift_type = Some(shift.shift_type.index()); + assigned += 1; + } + } + assert_eq!( + assigned, count, + "demo should have enough monitoring operators" + ); + } +} + +#[test] +fn monitoring_capacity_penalizes_shortage() { + let mut plan = build_demo_plan(); + schedule_first_order(&mut plan); + + assert_ne!(monitoring_score(&plan), 0); +} + +#[test] +fn monitoring_capacity_allows_exact_capacity() { + let mut plan = build_demo_plan(); + schedule_first_order(&mut plan); + assign_monitoring_shift(&mut plan, 0, 2); + + assert_eq!(monitoring_score(&plan), 0); +} + +#[test] +fn monitoring_capacity_allows_surplus_capacity() { + let mut plan = build_demo_plan(); + schedule_first_order(&mut plan); + assign_monitoring_shift(&mut plan, 0, 3); + + assert_eq!(monitoring_score(&plan), 0); +} + +#[test] +fn monitoring_capacity_counts_manual_task_consumption() { + let base = build_demo_plan(); + + for assignment_idx in 0..base.assignments.len() { + for capacity in 1..=3 { + let mut plan = base.clone(); + plan.assignments[assignment_idx].assignment = plan.assignments[assignment_idx] + .compatible_assignments + .first() + .copied(); + assign_monitoring_shift(&mut plan, assignment_idx, capacity); + if monitoring_score(&plan) != 0 { + continue; + } + + plan.assignments[assignment_idx].load_build_operator_id = plan.assignments + [assignment_idx] + .eligible_load_build_operator_ids + .first() + .copied(); + if monitoring_score(&plan) != 0 { + return; + } + } + } + + panic!("demo should contain a schedule where manual task consumption creates shortage"); +} + +#[test] +fn monitoring_capacity_retracts_updated_assignment() { + let mut plan = build_demo_plan(); + schedule_first_order(&mut plan); + assert_ne!(monitoring_hard(&plan), 0); + + plan.assignments[0].assignment = None; + + assert_eq!(monitoring_hard(&plan), 0); +} diff --git a/uc-furnace/src/constraints/tests/roster_hard.rs b/uc-furnace/src/constraints/tests/roster_hard.rs new file mode 100644 index 0000000..93e1a85 --- /dev/null +++ b/uc-furnace/src/constraints/tests/roster_hard.rs @@ -0,0 +1,44 @@ +use crate::constraints::create_constraints; +use crate::data::build_demo_plan; +use crate::domain::{Plan, ShiftType}; +use solverforge::ConstraintSet; + +fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { + create_constraints() + .evaluate_each(plan) + .into_iter() + .find(|result| result.name == constraint_name) + .expect("constraint result") + .score + .hard() +} + +#[test] +fn adjacent_night_run_within_policy_is_allowed() { + let mut plan = build_demo_plan(); + for day in 1..=3 { + let assignment = plan + .operator_shift_assignments + .iter_mut() + .find(|assignment| assignment.operator_idx == 0 && assignment.roster_day == day) + .expect("operator day assignment"); + assignment.shift_type = Some(ShiftType::Night.index()); + } + + assert_eq!(hard_score(&plan, "consecutive_nights"), 0); +} + +#[test] +fn night_count_beyond_policy_is_hard_penalized() { + let mut plan = build_demo_plan(); + for day in 1..=4 { + let assignment = plan + .operator_shift_assignments + .iter_mut() + .find(|assignment| assignment.operator_idx == 0 && assignment.roster_day == day) + .expect("operator day assignment"); + assignment.shift_type = Some(ShiftType::Night.index()); + } + + assert!(hard_score(&plan, "consecutive_nights") < 0); +} diff --git a/uc-furnace/src/constraints/tests/staffing_hard.rs b/uc-furnace/src/constraints/tests/staffing_hard.rs new file mode 100644 index 0000000..7b37ee1 --- /dev/null +++ b/uc-furnace/src/constraints/tests/staffing_hard.rs @@ -0,0 +1,188 @@ +use crate::constraints::create_constraints; +use crate::data::build_demo_plan; +use crate::domain::{ManualTaskKind, OperatorRole, Plan, RosterDay, ShiftType}; +use solverforge::ConstraintSet; +use std::collections::HashMap; + +fn hard_score(plan: &Plan, constraint_name: &str) -> i64 { + create_constraints() + .evaluate_each(plan) + .into_iter() + .find(|result| result.name == constraint_name) + .expect("constraint result") + .score + .hard() +} + +fn assign_role_count(plan: &mut Plan, shift_id: usize, role: OperatorRole, count: usize) { + let shift = plan.shifts[shift_id].identity(); + let mut assigned = 0usize; + for assignment in &mut plan.operator_shift_assignments { + if assigned == count { + break; + } + if assignment.role == role + && assignment.roster_day == shift.roster_day + && assignment.shift_type.is_none() + && assignment + .allowed_shift_types + .contains(&shift.shift_type.index()) + { + assignment.shift_type = Some(shift.shift_type.index()); + assigned += 1; + } + } + assert_eq!(assigned, count); +} + +fn schedule_operator_on_shift(plan: &mut Plan, operator_id: usize, shift_id: usize) { + let shift = plan.shifts[shift_id].identity(); + let assignment = plan + .operator_shift_assignments + .iter_mut() + .find(|assignment| { + assignment.operator_idx == operator_id + && assignment.roster_day == shift.roster_day + && assignment + .allowed_shift_types + .contains(&shift.shift_type.index()) + }) + .expect("operator shift assignment"); + assert!( + assignment.shift_type.is_none() || assignment.shift_type == Some(shift.shift_type.index()), + "operator cannot be assigned to two shift types on the same roster day" + ); + assignment.shift_type = Some(shift.shift_type.index()); +} + +fn pick_operator_for_task_shift( + plan: &Plan, + kind: ManualTaskKind, + rostered: &HashMap<(usize, RosterDay), ShiftType>, +) -> usize { + let shift = plan.assignments[0] + .task_shift_identity(kind) + .expect("task shift"); + plan.assignments[0] + .task_eligible_operator_ids(kind) + .iter() + .copied() + .find(|operator_id| { + rostered + .get(&(*operator_id, shift.roster_day)) + .is_none_or(|assigned_shift| *assigned_shift == shift.shift_type) + }) + .expect("eligible operator without conflicting roster-day shift") +} + +fn value_with_start(assignment: &crate::domain::FurnaceAssignment, start: usize) -> Option { + assignment + .compatible_assignments + .iter() + .copied() + .find(|value| (value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP == start) +} + +fn load_build_pair_with_start_delta(plan: &Plan, delta: usize) -> (usize, usize, usize, usize) { + for left_index in 0..plan.assignments.len() { + for right_index in (left_index + 1)..plan.assignments.len() { + for left_value in &plan.assignments[left_index].compatible_assignments { + let left_start = + (left_value % crate::domain::NUM_TIME_SLOTS) * crate::domain::TIME_STEP; + if left_start < 60 { + continue; + } + let right_start = left_start + delta; + if let Some(right_value) = + value_with_start(&plan.assignments[right_index], right_start) + { + return (left_index, *left_value, right_index, right_value); + } + } + } + } + panic!("load-build pair with start delta {delta}"); +} + +#[test] +fn shift_role_coverage_penalizes_missing_required_crew() { + let plan = build_demo_plan(); + + assert!(hard_score(&plan, "shift_role_coverage") < 0); +} + +#[test] +fn shift_role_coverage_allows_exact_required_crew() { + let mut plan = build_demo_plan(); + let demands = plan.shift_coverage_demands.clone(); + for demand in demands { + assign_role_count( + &mut plan, + demand.shift_id, + demand.role, + demand.required_count as usize, + ); + } + + assert_eq!(hard_score(&plan, "shift_role_coverage"), 0); +} + +#[test] +fn task_operator_on_owning_shift_allows_task_operator_working_that_shift() { + let mut plan = build_demo_plan(); + let value = plan.assignments[0].compatible_assignments[0]; + plan.assignments[0].assignment = Some(value); + + let mut rostered = HashMap::new(); + let task_kinds = plan.assignments[0].required_task_kinds(); + for kind in task_kinds { + let shift = plan.assignments[0] + .task_shift_identity(kind) + .expect("task shift"); + let operator_id = pick_operator_for_task_shift(&plan, kind, &rostered); + match kind { + ManualTaskKind::LoadBuild => { + plan.assignments[0].load_build_operator_id = Some(operator_id) + } + ManualTaskKind::Program => plan.assignments[0].program_operator_id = Some(operator_id), + ManualTaskKind::Quench => plan.assignments[0].quench_operator_id = Some(operator_id), + ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => { + plan.assignments[0].unload_operator_id = Some(operator_id) + } + } + let shift_id = plan.assignments[0] + .task_shift_identity(kind) + .expect("task shift") + .shift_id; + schedule_operator_on_shift(&mut plan, operator_id, shift_id); + rostered.insert((operator_id, shift.roster_day), shift.shift_type); + } + + assert_eq!(hard_score(&plan, "task_operator_on_owning_shift"), 0); +} + +#[test] +fn operator_double_booked_penalizes_actual_overlap_minutes_once() { + let mut plan = build_demo_plan(); + let (left_index, left_value, right_index, right_value) = + load_build_pair_with_start_delta(&plan, 15); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + plan.assignments[left_index].load_build_operator_id = Some(0); + plan.assignments[right_index].load_build_operator_id = Some(0); + + assert_eq!(hard_score(&plan, "operator_double_booked"), -13_500); +} + +#[test] +fn operator_double_booked_allows_touching_manual_task_intervals() { + let mut plan = build_demo_plan(); + let (left_index, left_value, right_index, right_value) = + load_build_pair_with_start_delta(&plan, 30); + plan.assignments[left_index].assignment = Some(left_value); + plan.assignments[right_index].assignment = Some(right_value); + plan.assignments[left_index].load_build_operator_id = Some(0); + plan.assignments[right_index].load_build_operator_id = Some(0); + + assert_eq!(hard_score(&plan, "operator_double_booked"), 0); +} diff --git a/uc-furnace/src/constraints/thermal_changeover.rs b/uc-furnace/src/constraints/thermal_changeover.rs new file mode 100644 index 0000000..6c81ffb --- /dev/null +++ b/uc-furnace/src/constraints/thermal_changeover.rs @@ -0,0 +1,19 @@ +use super::shared::*; + +/// Penalizes adjacent jobs on the same furnace for thermal changeover cost. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .join(equal(|assignment: &FurnaceAssignment| { + assignment.furnace_idx() + })) + .filter(|left: &FurnaceAssignment, right: &FurnaceAssignment| { + left.work_order_idx != right.work_order_idx + && right.start_minutes().unwrap() == left.end_minutes().unwrap() + }) + .penalize(|left: &FurnaceAssignment, right: &FurnaceAssignment| { + HardSoftScore::of_soft(calculate_changeover_cost_for_sequence(left, right) as i64) + }) + .named("thermal_changeover") +} diff --git a/uc-furnace/src/constraints/unassigned_orders.rs b/uc-furnace/src/constraints/unassigned_orders.rs new file mode 100644 index 0000000..b7cced6 --- /dev/null +++ b/uc-furnace/src/constraints/unassigned_orders.rs @@ -0,0 +1,12 @@ +use super::shared::*; + +/// Penalizes work orders that have not been assigned to a furnace and start time. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_none()) + .penalize(hard_weight(|_: &FurnaceAssignment| { + HardSoftScore::of_hard(30_000) + })) + .named("unassigned_orders") +} diff --git a/uc-furnace/src/constraints/unload_shift_ownership.rs b/uc-furnace/src/constraints/unload_shift_ownership.rs new file mode 100644 index 0000000..13c8b44 --- /dev/null +++ b/uc-furnace/src/constraints/unload_shift_ownership.rs @@ -0,0 +1,15 @@ +use super::shared::*; + +/// Requires unload work to be owned by the shift covering that task interval. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.assignment.is_some()) + .filter(|assignment: &FurnaceAssignment| { + assignment.unload_interval().is_some() && assignment.unload_shift_identity().is_none() + }) + .penalize(hard_weight(|_: &FurnaceAssignment| { + HardSoftScore::of_hard(900) + })) + .named("unload_shift_ownership") +} diff --git a/uc-furnace/src/constraints/urgent_lateness.rs b/uc-furnace/src/constraints/urgent_lateness.rs new file mode 100644 index 0000000..7feee9e --- /dev/null +++ b/uc-furnace/src/constraints/urgent_lateness.rs @@ -0,0 +1,22 @@ +use super::shared::*; + +/// Penalizes urgent work that finishes after its due time. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .assignments() + .filter(|assignment: &FurnaceAssignment| assignment.priority == PriorityBand::Urgent) + .filter(|assignment: &FurnaceAssignment| { + assignment + .end_minutes() + .is_some_and(|end| end > assignment.due_datetime_minutes) + }) + .penalize(|assignment: &FurnaceAssignment| { + priority_lateness_score( + assignment.end_minutes().unwrap(), + assignment.due_datetime_minutes, + 20, + ) + .unwrap() + }) + .named("urgent_lateness") +} diff --git a/uc-furnace/src/constraints/visible_shift_limit.rs b/uc-furnace/src/constraints/visible_shift_limit.rs new file mode 100644 index 0000000..d0798da --- /dev/null +++ b/uc-furnace/src/constraints/visible_shift_limit.rs @@ -0,0 +1,22 @@ +use super::shared::*; + +/// Caps the number of visible roster shifts an operator may work in the week. +pub fn constraint() -> impl IncrementalConstraint { + ConstraintFactory::::new() + .operator_shift_assignments() + .filter(|assignment: &OperatorShiftAssignment| { + assignment.roster_day >= 0 && assignment.is_working() + }) + .group_by( + |assignment: &OperatorShiftAssignment| assignment.operator_idx, + count(), + ) + .penalize(hard_weight( + |_operator_idx: &usize, visible_shifts: &usize| { + HardSoftScore::of_hard( + visible_shifts.saturating_sub(MAX_VISIBLE_SHIFTS_PER_WEEK) as i64 * 900, + ) + }, + )) + .named("visible_shift_limit") +} diff --git a/uc-furnace/src/data/data_seed/base_data.rs b/uc-furnace/src/data/data_seed/base_data.rs index d2230cb..c609748 100644 --- a/uc-furnace/src/data/data_seed/base_data.rs +++ b/uc-furnace/src/data/data_seed/base_data.rs @@ -2,10 +2,10 @@ use rand::rngs::SmallRng; use rand::SeedableRng; use crate::domain::{ - furnace_accepts_work_order, Furnace, FurnaceAssignment, FurnaceType, HeatTreatmentProcess, - Operator, OperatorRole, OperatorSkill, Shift, ShiftCoverageDemand, ShiftType, SkillMask, - WorkOrder, CARRY_OUT_END_MINUTE, MINUTES_PER_DAY, NUM_DAYS, NUM_TIME_SLOTS, - STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, TIME_STEP, + furnace_accepts_work_order, Furnace, FurnaceAssignment, FurnaceAssignmentInit, FurnaceType, + HeatTreatmentProcess, Operator, OperatorRole, OperatorSkill, Shift, ShiftCoverageDemand, + ShiftType, SkillMask, WorkOrder, CARRY_OUT_END_MINUTE, MINUTES_PER_DAY, NUM_DAYS, + NUM_TIME_SLOTS, STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, TIME_STEP, }; use HeatTreatmentProcess::*; @@ -282,7 +282,7 @@ fn build_assignments( SkillMask::empty().insert(OperatorSkill::LoadBuild) }; - FurnaceAssignment { + FurnaceAssignment::new(FurnaceAssignmentInit { compatible_assignments: furnaces .iter() .enumerate() @@ -313,7 +313,6 @@ fn build_assignments( due_datetime_minutes: work_order.due_datetime_minutes, priority: work_order.priority, requires_quench: work_order.requires_quench, - assignment: None, eligible_load_build_operator_ids: eligible_operator_ids( operators, load_build_skills, @@ -325,11 +324,7 @@ fn build_assignments( Vec::new() }, eligible_unload_operator_ids: eligible_operator_ids(operators, unload_skills), - load_build_operator_id: None, - program_operator_id: None, - quench_operator_id: None, - unload_operator_id: None, - } + }) }) .collect() } diff --git a/uc-furnace/src/data/data_seed/problem.rs b/uc-furnace/src/data/data_seed/problem.rs index 0687a47..f616ac4 100644 --- a/uc-furnace/src/data/data_seed/problem.rs +++ b/uc-furnace/src/data/data_seed/problem.rs @@ -1,6 +1,6 @@ use crate::domain::{ - allowed_shift_types_for, Operator, OperatorShiftAssignment, Plan, Shift, - STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, + allowed_shift_types_for, Operator, OperatorShiftAssignment, OperatorShiftAssignmentInit, Plan, + Shift, STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, }; use super::base_data::build_demo; @@ -28,16 +28,15 @@ pub(crate) fn build_demo_problem_for(demo: DemoData) -> Plan { fn build_canonical_plan(demo: DemoSeed) -> Plan { let operator_shift_assignments = build_operator_shift_assignments(&demo.operators, &demo.shifts); - Plan { - furnaces: demo.furnaces, - work_orders: demo.work_orders, - operators: demo.operators, - shifts: demo.shifts, - shift_coverage_demands: demo.shift_coverage_demands, - assignments: demo.assignments, + Plan::new( + demo.furnaces, + demo.work_orders, + demo.operators, + demo.shifts, + demo.shift_coverage_demands, + demo.assignments, operator_shift_assignments, - score: None, - } + ) } fn build_operator_shift_assignments( @@ -49,7 +48,7 @@ fn build_operator_shift_assignments( for operator in operators { for roster_day in STAFFING_ROSTER_DAY_START..=STAFFING_ROSTER_DAY_END { - assignments.push(OperatorShiftAssignment { + assignments.push(OperatorShiftAssignment::new(OperatorShiftAssignmentInit { id: assignment_id, operator_idx: operator.id, operator_name: operator.name, @@ -62,8 +61,7 @@ fn build_operator_shift_assignments( operator.day_only, roster_day, ), - shift_type: None, - }); + })); assignment_id += 1; } } diff --git a/uc-furnace/src/data/data_seed/tests.rs b/uc-furnace/src/data/data_seed/tests.rs index d8b6295..3da4251 100644 --- a/uc-furnace/src/data/data_seed/tests.rs +++ b/uc-furnace/src/data/data_seed/tests.rs @@ -314,17 +314,17 @@ fn first_compatible_assignment_values_rotate_across_furnaces() { #[test] fn demo_profiles_have_furnace_capacity_certificate() { const FURNACE_HARD_CONSTRAINTS: &[&str] = &[ - "unassignedOrders", - "incompatibleProcess", - "excessiveTemperature", - "excessiveLoad", - "outsideWeek", - "furnaceOverlap", - "changeoverGap", - "loadBuildShiftOwnership", - "programShiftOwnership", - "quenchShiftOwnership", - "unloadShiftOwnership", + "unassigned_orders", + "incompatible_process", + "excessive_temperature", + "excessive_load", + "outside_week", + "furnace_overlap", + "changeover_gap", + "load_build_shift_ownership", + "program_shift_ownership", + "quench_shift_ownership", + "unload_shift_ownership", ]; for demo in DemoData::ALL { diff --git a/uc-furnace/src/domain/changeover.rs b/uc-furnace/src/domain/changeover.rs index 4b47bdf..79e8d4f 100644 --- a/uc-furnace/src/domain/changeover.rs +++ b/uc-furnace/src/domain/changeover.rs @@ -1,5 +1,5 @@ use super::enums::HeatTreatmentProcess; -use super::furnace::FurnaceAssignment; +use super::furnace_assignment::FurnaceAssignment; pub fn changeover_minutes(from_temp: u32, to_temp: u32) -> u32 { if from_temp == to_temp { @@ -55,7 +55,7 @@ fn process_family_penalty(left: HeatTreatmentProcess, right: HeatTreatmentProces #[cfg(test)] mod tests { use super::*; - use crate::domain::{FurnaceAssignment, PriorityBand}; + use crate::domain::{FurnaceAssignment, FurnaceAssignmentInit, PriorityBand}; #[test] fn same_temperature_is_zero() { @@ -72,44 +72,40 @@ mod tests { #[test] fn family_penalty_changes_sequence_cost() { let left = FurnaceAssignment { - work_order_idx: 0, - process: HeatTreatmentProcess::Quenching, - temperature_celsius: 850, - soak_time_minutes: 90, - load_weight_kg: 500, - due_datetime_minutes: 0, - priority: PriorityBand::Standard, - requires_quench: true, - compatible_assignments: vec![0], assignment: Some(0), - eligible_load_build_operator_ids: vec![0], - eligible_program_operator_ids: vec![0], - eligible_quench_operator_ids: vec![0], - eligible_unload_operator_ids: vec![0], - load_build_operator_id: None, - program_operator_id: None, - quench_operator_id: None, - unload_operator_id: None, + ..FurnaceAssignment::new(FurnaceAssignmentInit { + work_order_idx: 0, + process: HeatTreatmentProcess::Quenching, + temperature_celsius: 850, + soak_time_minutes: 90, + load_weight_kg: 500, + due_datetime_minutes: 0, + priority: PriorityBand::Standard, + requires_quench: true, + compatible_assignments: vec![0], + eligible_load_build_operator_ids: vec![0], + eligible_program_operator_ids: vec![0], + eligible_quench_operator_ids: vec![0], + eligible_unload_operator_ids: vec![0], + }) }; let right = FurnaceAssignment { - work_order_idx: 1, - process: HeatTreatmentProcess::Tempering, - temperature_celsius: 210, - soak_time_minutes: 60, - load_weight_kg: 400, - due_datetime_minutes: 0, - priority: PriorityBand::Standard, - requires_quench: false, - compatible_assignments: vec![1], assignment: Some(1), - eligible_load_build_operator_ids: vec![0], - eligible_program_operator_ids: vec![0], - eligible_quench_operator_ids: vec![0], - eligible_unload_operator_ids: vec![0], - load_build_operator_id: None, - program_operator_id: None, - quench_operator_id: None, - unload_operator_id: None, + ..FurnaceAssignment::new(FurnaceAssignmentInit { + work_order_idx: 1, + process: HeatTreatmentProcess::Tempering, + temperature_celsius: 210, + soak_time_minutes: 60, + load_weight_kg: 400, + due_datetime_minutes: 0, + priority: PriorityBand::Standard, + requires_quench: false, + compatible_assignments: vec![1], + eligible_load_build_operator_ids: vec![0], + eligible_program_operator_ids: vec![0], + eligible_quench_operator_ids: vec![0], + eligible_unload_operator_ids: vec![0], + }) }; assert!(calculate_changeover_cost_for_sequence(&left, &right) > 0); diff --git a/uc-furnace/src/domain/furnace.rs b/uc-furnace/src/domain/furnace.rs index 445a6ee..849ba1b 100644 --- a/uc-furnace/src/domain/furnace.rs +++ b/uc-furnace/src/domain/furnace.rs @@ -1,934 +1,34 @@ use solverforge::prelude::*; -use super::changeover::calculate_changeover_cost_for_sequence; -use super::constants::{NUM_TIME_SLOTS, TIME_STEP}; -use super::enums::{HeatTreatmentProcess, OperatorSkill, PriorityBand, ShiftType}; -use super::plan::Plan; -use super::support::{ - HardViolation, ManualTaskBooking, ManualTaskDemand, ManualTaskKind, MonitoringEntry, - MonitoringLoad, ShiftIdentity, ShiftWorkEntry, SkillMask, -}; -use super::time::{ - heating_ramp_minutes, monitoring_bucket_for_minute, owning_shift_identity_for_interval, - owning_shift_identity_for_minute, shift_identities_for_interval, -}; +use super::enums::{FurnaceType, HeatTreatmentProcess}; -#[planning_entity] -pub struct FurnaceAssignment { +#[problem_fact] +pub struct Furnace { #[planning_id] - pub work_order_idx: usize, - pub process: HeatTreatmentProcess, - pub temperature_celsius: u32, - pub soak_time_minutes: u32, - pub load_weight_kg: u32, - pub due_datetime_minutes: usize, - pub priority: PriorityBand, - pub requires_quench: bool, - pub compatible_assignments: Vec, - #[planning_variable( - allows_unassigned = true, - value_range_provider = "compatible_assignments", - construction_entity_order_key = "furnace_assignment_construction_entity_order_key", - construction_value_order_key = "furnace_assignment_construction_value_order_key" - )] - pub assignment: Option, - pub eligible_load_build_operator_ids: Vec, - pub eligible_program_operator_ids: Vec, - pub eligible_quench_operator_ids: Vec, - pub eligible_unload_operator_ids: Vec, - #[planning_variable( - allows_unassigned = true, - value_range_provider = "eligible_load_build_operator_ids", - construction_entity_order_key = "task_operator_construction_entity_order_key", - construction_value_order_key = "load_build_operator_construction_value_order_key" - )] - pub load_build_operator_id: Option, - #[planning_variable( - allows_unassigned = true, - value_range_provider = "eligible_program_operator_ids", - construction_entity_order_key = "task_operator_construction_entity_order_key", - construction_value_order_key = "program_operator_construction_value_order_key" - )] - pub program_operator_id: Option, - #[planning_variable( - allows_unassigned = true, - value_range_provider = "eligible_quench_operator_ids", - construction_entity_order_key = "task_operator_construction_entity_order_key", - construction_value_order_key = "quench_operator_construction_value_order_key" - )] - pub quench_operator_id: Option, - #[planning_variable( - allows_unassigned = true, - value_range_provider = "eligible_unload_operator_ids", - construction_entity_order_key = "task_operator_construction_entity_order_key", - construction_value_order_key = "unload_operator_construction_value_order_key" - )] - pub unload_operator_id: Option, + pub id: usize, + pub name: &'static str, + pub max_temp_celsius: u32, + pub max_load_kg: u32, + pub furnace_type: FurnaceType, + pub heating_rate_c_per_minute: u32, + pub cooling_rate_c_per_minute: u32, + pub supported_processes: &'static [HeatTreatmentProcess], } -impl FurnaceAssignment { - pub fn is_scheduled(&self) -> bool { - self.assignment.is_some() - } - - pub fn furnace_idx(&self) -> Option { - self.assignment.map(|value| value / NUM_TIME_SLOTS) - } - - pub fn time_slot_idx(&self) -> Option { - self.assignment.map(|value| value % NUM_TIME_SLOTS) - } - - pub fn start_minutes(&self) -> Option { - self.time_slot_idx().map(|slot| slot * TIME_STEP) - } - - pub fn end_minutes(&self) -> Option { - self.start_minutes() - .map(|start| start + self.soak_time_minutes as usize) - } - - pub fn duration_minutes(&self) -> usize { - self.soak_time_minutes as usize - } - - pub fn priority_weight(&self) -> i64 { - self.priority.weight() - } - - pub fn start_shift_identity(&self) -> Option { - self.start_minutes() - .and_then(owning_shift_identity_for_minute) - } - - pub fn completion_shift_identity(&self) -> Option { - self.end_minutes() - .and_then(owning_shift_identity_for_minute) - } - - pub fn load_build_interval(&self) -> Option<(usize, usize)> { - let start = self.start_minutes()?; - let interval_start = start.saturating_sub(60); - let interval_end = start.saturating_sub(30); - (interval_end > interval_start).then_some((interval_start, interval_end)) - } - - pub fn program_interval(&self) -> Option<(usize, usize)> { - let start = self.start_minutes()?; - let interval_start = start.saturating_sub(15); - (start > interval_start).then_some((interval_start, start)) - } - - pub fn quench_interval(&self) -> Option<(usize, usize)> { - if !self.requires_quench { - return None; - } - let end = self.end_minutes()?; - Some((end, end + 15)) - } - - pub fn unload_interval(&self) -> Option<(usize, usize)> { - let end = self.end_minutes()?; - Some((end + 15, end + 30)) - } - - pub fn load_build_shift_identity(&self) -> Option { - self.load_build_interval() - .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) - } - - pub fn program_shift_identity(&self) -> Option { - self.program_interval() - .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) - } - - pub fn quench_shift_identity(&self) -> Option { - self.quench_interval() - .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) - } - - pub fn unload_shift_identity(&self) -> Option { - self.unload_interval() - .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) - } - - pub fn occupied_shift_identities(&self) -> Vec { - let Some(start) = self.start_minutes() else { - return Vec::new(); - }; - let Some(end) = self.end_minutes() else { - return Vec::new(); - }; - shift_identities_for_interval(start, end) - } - - pub fn task_interval(&self, kind: ManualTaskKind) -> Option<(usize, usize)> { - match kind { - ManualTaskKind::LoadBuild => self.load_build_interval(), - ManualTaskKind::Program => self.program_interval(), - ManualTaskKind::Quench => self.quench_interval(), - ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_interval(), - } - } - - pub fn task_shift_identity(&self, kind: ManualTaskKind) -> Option { - self.task_interval(kind) - .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) - } - - pub fn load_build_required_skills(&self) -> SkillMask { - SkillMask::empty().insert(OperatorSkill::LoadBuild) - } - - pub fn program_required_skills(&self) -> SkillMask { - SkillMask::empty().insert(OperatorSkill::FurnaceProgram) - } - - pub fn quench_required_skills(&self) -> SkillMask { - SkillMask::empty().insert(OperatorSkill::QuenchOperate) - } - - pub fn unload_required_skills(&self) -> SkillMask { - if self.load_weight_kg > 500 { - SkillMask::empty() - .insert(OperatorSkill::LoadBuild) - .insert(OperatorSkill::CraneForklift) - } else { - SkillMask::empty().insert(OperatorSkill::LoadBuild) - } - } - - pub fn task_required_skills(&self, kind: ManualTaskKind) -> SkillMask { - match kind { - ManualTaskKind::LoadBuild => self.load_build_required_skills(), - ManualTaskKind::Program => self.program_required_skills(), - ManualTaskKind::Quench => self.quench_required_skills(), - ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_required_skills(), - } - } - - pub fn unload_task_kind(&self) -> ManualTaskKind { - if self.load_weight_kg > 500 { - ManualTaskKind::HeavyUnload - } else { - ManualTaskKind::Unload - } - } - - pub fn task_operator_id(&self, kind: ManualTaskKind) -> Option { - match kind { - ManualTaskKind::LoadBuild => self.load_build_operator_id, - ManualTaskKind::Program => self.program_operator_id, - ManualTaskKind::Quench => self.quench_operator_id, - ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_operator_id, - } - } - - pub fn task_eligible_operator_ids(&self, kind: ManualTaskKind) -> &[usize] { - match kind { - ManualTaskKind::LoadBuild => &self.eligible_load_build_operator_ids, - ManualTaskKind::Program => &self.eligible_program_operator_ids, - ManualTaskKind::Quench => &self.eligible_quench_operator_ids, - ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => { - &self.eligible_unload_operator_ids - } - } - } - - pub fn required_task_kinds(&self) -> Vec { - if !self.is_scheduled() { - return Vec::new(); - } - - let mut kinds = Vec::with_capacity(4); - if self.load_build_interval().is_some() { - kinds.push(ManualTaskKind::LoadBuild); - } - if self.program_interval().is_some() { - kinds.push(ManualTaskKind::Program); - } - if self.quench_interval().is_some() { - kinds.push(ManualTaskKind::Quench); - } - if self.unload_interval().is_some() { - kinds.push(self.unload_task_kind()); - } - kinds - } - - pub fn manual_task_demands(&self) -> Vec { - let mut demands = Vec::new(); - self.for_each_manual_task_demand(|demand| demands.push(demand)); - demands - } - - pub fn for_each_manual_task_demand(&self, mut emit: impl FnMut(ManualTaskDemand)) { - let Some(furnace_idx) = self.furnace_idx() else { - return; - }; - - push_manual_task_with( - self.work_order_idx, - furnace_idx, - self.load_build_interval(), - ManualTaskKind::LoadBuild, - self.load_build_required_skills(), - &mut emit, - ); - push_manual_task_with( - self.work_order_idx, - furnace_idx, - self.program_interval(), - ManualTaskKind::Program, - self.program_required_skills(), - &mut emit, - ); - push_manual_task_with( - self.work_order_idx, - furnace_idx, - self.quench_interval(), - ManualTaskKind::Quench, - self.quench_required_skills(), - &mut emit, - ); - push_manual_task_with( - self.work_order_idx, - furnace_idx, - self.unload_interval(), - self.unload_task_kind(), - self.unload_required_skills(), - &mut emit, - ); - } - - pub fn manual_task_bookings(&self) -> Vec { - let mut bookings = Vec::new(); - self.for_each_manual_task_booking(|booking| bookings.push(booking)); - bookings - } - - pub fn for_each_manual_task_booking(&self, mut emit: impl FnMut(ManualTaskBooking)) { - let Some(furnace_idx) = self.furnace_idx() else { - return; - }; - - push_manual_task_booking_with( - self, - furnace_idx, - self.load_build_interval(), - ManualTaskKind::LoadBuild, - self.load_build_required_skills(), - &mut emit, - ); - push_manual_task_booking_with( - self, - furnace_idx, - self.program_interval(), - ManualTaskKind::Program, - self.program_required_skills(), - &mut emit, - ); - push_manual_task_booking_with( - self, - furnace_idx, - self.quench_interval(), - ManualTaskKind::Quench, - self.quench_required_skills(), - &mut emit, - ); - push_manual_task_booking_with( - self, - furnace_idx, - self.unload_interval(), - self.unload_task_kind(), - self.unload_required_skills(), - &mut emit, - ); - } - - pub fn task_operator_range_violations(&self) -> Vec { - [ - (ManualTaskKind::LoadBuild, self.load_build_operator_id), - (ManualTaskKind::Program, self.program_operator_id), - (ManualTaskKind::Quench, self.quench_operator_id), - (self.unload_task_kind(), self.unload_operator_id), - ] - .into_iter() - .filter_map(|(kind, operator_id)| { - let operator_id = operator_id?; - (!self.task_eligible_operator_ids(kind).contains(&operator_id)) - .then_some(HardViolation { weight: 900 }) - }) - .collect() - } - +impl Furnace { pub fn finalize(&mut self) {} } -pub(crate) fn furnace_assignment_construction_entity_order_key( - _plan: &Plan, - assignment: &FurnaceAssignment, -) -> i64 { - let range_size = assignment.compatible_assignments.len() as i64; - let due = assignment.due_datetime_minutes as i64; - let duration = assignment.duration_minutes() as i64; - -due.saturating_mul(10_000) - range_size.saturating_mul(100) + duration -} - -pub(crate) fn furnace_assignment_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - value: usize, -) -> i64 { - if assignment.assignment == Some(value) { - return i64::MIN; - } - - let furnace_idx = value / NUM_TIME_SLOTS; - let slot_idx = value % NUM_TIME_SLOTS; - let start = slot_idx * TIME_STEP; - let end = start + assignment.duration_minutes(); - let due_distance = assignment.due_datetime_minutes.abs_diff(end) as i64; - let schedule_conflict = - furnace_candidate_schedule_conflict(plan, assignment, furnace_idx, start, end); - let shift_gap = usize::from(candidate_has_shift_ownership_gap(assignment, start, end)) as i64; - let rotated_furnace_rank = if plan.furnaces.is_empty() { - 0 - } else { - ((furnace_idx + assignment.work_order_idx) % plan.furnaces.len()) as i64 - }; - - schedule_conflict.saturating_mul(100_000_000) - + shift_gap.saturating_mul(10_000_000) - + due_distance.saturating_mul(1_000) - + start as i64 - + rotated_furnace_rank -} - -pub(crate) fn furnace_assignment_local_search_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - value: usize, -) -> i64 { - if assignment.assignment == Some(value) { - return i64::MIN; - } - - let furnace_idx = value / NUM_TIME_SLOTS; - let slot_idx = value % NUM_TIME_SLOTS; - let start = slot_idx * TIME_STEP; - let end = start + assignment.duration_minutes(); - let timing_penalty = furnace_candidate_timing_soft_proxy(assignment, start, end); - let schedule_conflict = - furnace_candidate_schedule_conflict(plan, assignment, furnace_idx, start, end); - let shift_gap = usize::from(candidate_has_shift_ownership_gap(assignment, start, end)) as i64; - let rotated_furnace_rank = if plan.furnaces.is_empty() { - 0 - } else { - ((furnace_idx + assignment.work_order_idx) % plan.furnaces.len()) as i64 - }; - - schedule_conflict.saturating_mul(100_000_000) - + shift_gap.saturating_mul(10_000_000) - + timing_penalty.saturating_mul(10_000) - + start as i64 - + rotated_furnace_rank -} - -fn furnace_candidate_timing_soft_proxy( - assignment: &FurnaceAssignment, - start: usize, - end: usize, -) -> i64 { - let due_penalty = if end > assignment.due_datetime_minutes { - (end - assignment.due_datetime_minutes) as i64 * priority_lateness_multiplier(assignment) - } else { - ((assignment.due_datetime_minutes - end) as i64) / 40 - }; - due_penalty + night_start_penalty(assignment, start) -} - -fn priority_lateness_multiplier(assignment: &FurnaceAssignment) -> i64 { - match assignment.priority { - PriorityBand::Express => 60, - PriorityBand::Urgent => 20, - PriorityBand::Standard => 5, - } -} - -fn night_start_penalty(assignment: &FurnaceAssignment, start: usize) -> i64 { - let starts_at_night = owning_shift_identity_for_minute(start) - .is_some_and(|shift| shift.shift_type == ShiftType::Night); - if !starts_at_night - || matches!( - assignment.process, - HeatTreatmentProcess::Carburizing | HeatTreatmentProcess::Nitriding - ) - { - return 0; - } - match assignment.priority { - PriorityBand::Express => 40, - PriorityBand::Urgent => 70, - PriorityBand::Standard => 120, - } -} - -fn furnace_candidate_schedule_conflict( - plan: &Plan, - assignment: &FurnaceAssignment, - furnace_idx: usize, - start: usize, - end: usize, -) -> i64 { - let mut penalty = 0_i64; - for other in &plan.assignments { - if other.work_order_idx == assignment.work_order_idx - || other.furnace_idx() != Some(furnace_idx) - { - continue; - } - let Some(other_start) = other.start_minutes() else { - continue; - }; - let Some(other_end) = other.end_minutes() else { - continue; - }; - - if start < other_end && other_start < end { - penalty = penalty - .saturating_add(10_000 + overlap_minutes(start, end, other_start, other_end)); - continue; - } - if other_end <= start { - let required_gap = calculate_changeover_cost_for_sequence(other, assignment) as usize; - if start - other_end < required_gap { - penalty = penalty.saturating_add((required_gap - (start - other_end)) as i64); - } - } else if end <= other_start { - let required_gap = calculate_changeover_cost_for_sequence(assignment, other) as usize; - if other_start - end < required_gap { - penalty = penalty.saturating_add((required_gap - (other_start - end)) as i64); - } - } - } - penalty -} - -fn overlap_minutes( - left_start: usize, - left_end: usize, - right_start: usize, - right_end: usize, -) -> i64 { - left_end - .min(right_end) - .saturating_sub(left_start.max(right_start)) as i64 -} - -pub(crate) fn task_operator_construction_entity_order_key( - _plan: &Plan, - assignment: &FurnaceAssignment, -) -> i64 { - let start = assignment.start_minutes().unwrap_or(usize::MAX) as i64; - let range_size = [ - assignment.eligible_load_build_operator_ids.len(), - assignment.eligible_program_operator_ids.len(), - assignment.eligible_quench_operator_ids.len(), - assignment.eligible_unload_operator_ids.len(), - ] - .into_iter() - .filter(|size| *size > 0) - .min() - .unwrap_or(usize::MAX) as i64; - - start.saturating_mul(10_000) + range_size.saturating_mul(100) + assignment.work_order_idx as i64 -} - -pub(crate) fn load_build_operator_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - operator_id: usize, -) -> i64 { - task_operator_construction_value_order_key( - plan, - assignment, - ManualTaskKind::LoadBuild, - operator_id, - ) -} - -pub(crate) fn program_operator_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - operator_id: usize, -) -> i64 { - task_operator_construction_value_order_key( - plan, - assignment, - ManualTaskKind::Program, - operator_id, - ) -} - -pub(crate) fn quench_operator_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - operator_id: usize, -) -> i64 { - task_operator_construction_value_order_key( - plan, - assignment, - ManualTaskKind::Quench, - operator_id, - ) -} - -pub(crate) fn unload_operator_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - operator_id: usize, -) -> i64 { - task_operator_construction_value_order_key( - plan, - assignment, - assignment.unload_task_kind(), - operator_id, - ) -} - -fn task_operator_construction_value_order_key( - plan: &Plan, - assignment: &FurnaceAssignment, - kind: ManualTaskKind, - operator_id: usize, -) -> i64 { - let shift_fit = assignment - .task_shift_identity(kind) - .map(|shift| operator_shift_fit(plan, operator_id, shift)) - .unwrap_or(9); - let shift_conflict = assignment - .task_shift_identity(kind) - .map(|shift| operator_existing_shift_conflict(plan, operator_id, shift)) - .unwrap_or(0); - let overlap_conflict = assignment - .task_interval(kind) - .map(|(start, end)| operator_existing_task_overlap(plan, operator_id, start, end)) - .unwrap_or(0); - let current_task_count = plan - .assignments - .iter() - .filter(|other| { - [ - other.load_build_operator_id, - other.program_operator_id, - other.quench_operator_id, - other.unload_operator_id, - ] - .contains(&Some(operator_id)) - }) - .count() as i64; - - shift_conflict.saturating_mul(100_000_000) - + overlap_conflict.saturating_mul(10_000_000) - + shift_fit.saturating_mul(1_000_000) - + current_task_count.saturating_mul(1_000) - + operator_id as i64 -} - -fn operator_shift_fit(plan: &Plan, operator_id: usize, shift: ShiftIdentity) -> i64 { - let Some(shift_assignment) = plan.operator_shift_assignments.iter().find(|assignment| { - assignment.operator_idx == operator_id && assignment.roster_day == shift.roster_day - }) else { - return 9; - }; - - if shift_assignment.shift_id() == Some(shift.shift_id) { - 0 - } else if shift_assignment - .allowed_shift_types - .contains(&shift.shift_type.index()) - { - 1 - } else { - 9 +impl Furnace { + pub fn supports_process(&self, process: HeatTreatmentProcess) -> bool { + self.supported_processes.contains(&process) } -} -fn operator_existing_shift_conflict(plan: &Plan, operator_id: usize, shift: ShiftIdentity) -> i64 { - for assignment in &plan.assignments { - for kind in assignment.required_task_kinds() { - if assignment.task_operator_id(kind) != Some(operator_id) { - continue; - } - let Some(existing_shift) = assignment.task_shift_identity(kind) else { - continue; - }; - if existing_shift.roster_day == shift.roster_day - && existing_shift.shift_id != shift.shift_id - { - return 1; - } - } + pub fn supports_temperature(&self, temperature_celsius: u32) -> bool { + temperature_celsius <= self.max_temp_celsius } - 0 -} -fn operator_existing_task_overlap( - plan: &Plan, - operator_id: usize, - start: usize, - end: usize, -) -> i64 { - for assignment in &plan.assignments { - for kind in assignment.required_task_kinds() { - if assignment.task_operator_id(kind) != Some(operator_id) { - continue; - } - let Some((existing_start, existing_end)) = assignment.task_interval(kind) else { - continue; - }; - if start < existing_end && existing_start < end { - return 1; - } - } + pub fn supports_load(&self, load_weight_kg: u32) -> bool { + load_weight_kg <= self.max_load_kg } - 0 -} - -fn candidate_has_shift_ownership_gap( - assignment: &FurnaceAssignment, - start: usize, - end: usize, -) -> bool { - let load_build = (start >= 60) - .then(|| (start - 60, start - 30)) - .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); - let program = (start >= 15) - .then(|| (start - 15, start)) - .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); - let quench = assignment - .requires_quench - .then_some((end, end + 15)) - .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); - let unload = owning_shift_identity_for_interval(end + 15, end + 30); - - load_build.is_none() - || program.is_none() - || (assignment.requires_quench && quench.is_none()) - || unload.is_none() -} - -pub struct AssignedTaskCapacityEntries; - -impl Projection for AssignedTaskCapacityEntries { - type Out = MonitoringEntry; - const MAX_EMITS: usize = 2_688; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - assignment.for_each_manual_task_booking(|booking| { - emit_monitoring_entries( - out, - booking.start_minute, - booking.end_minute, - MonitoringLoad { - task: 1, - ..MonitoringLoad::default() - }, - ); - }); - } -} - -pub struct ManualTaskBookingEntries; - -impl Projection for ManualTaskBookingEntries { - type Out = ManualTaskBooking; - const MAX_EMITS: usize = 4; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - assignment.for_each_manual_task_booking(|booking| out.emit(booking)); - } -} - -pub struct TaskShiftWorkEntries; - -impl Projection for TaskShiftWorkEntries { - type Out = ShiftWorkEntry; - const MAX_EMITS: usize = 4; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - assignment.for_each_manual_task_booking(|booking| { - out.emit(ShiftWorkEntry { - operator_id: booking.operator_id, - shift_id: booking.shift.shift_id, - delta: 1, - }); - }); - } -} - -pub struct AssignedTaskWithoutScheduleViolations; - -impl Projection for AssignedTaskWithoutScheduleViolations { - type Out = HardViolation; - const MAX_EMITS: usize = 4; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - if assignment.assignment.is_some() { - return; - } - let assigned_count = [ - assignment.load_build_operator_id, - assignment.program_operator_id, - assignment.quench_operator_id, - assignment.unload_operator_id, - ] - .into_iter() - .filter(Option::is_some) - .count(); - for _ in 0..assigned_count { - out.emit(HardViolation { weight: 900 }); - } - } -} - -pub struct MissingTaskOperatorViolations; - -impl Projection for MissingTaskOperatorViolations { - type Out = HardViolation; - const MAX_EMITS: usize = 4; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - for kind in assignment.required_task_kinds() { - if assignment.task_operator_id(kind).is_none() { - out.emit(HardViolation { weight: 4_500 }); - } - } - } -} - -pub struct MonitoringDemandEntries; - -impl Projection for MonitoringDemandEntries { - type Out = MonitoringEntry; - const MAX_EMITS: usize = 1_344; - - fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) - where - Sink: ProjectionSink, - { - let Some(start) = assignment.start_minutes() else { - return; - }; - let Some(end) = assignment.end_minutes() else { - return; - }; - - let ramp_end = start + heating_ramp_minutes(assignment.duration_minutes()); - emit_monitoring_entries( - out, - start, - ramp_end, - MonitoringLoad { - ramp: 1, - ..MonitoringLoad::default() - }, - ); - emit_monitoring_entries( - out, - ramp_end, - end, - MonitoringLoad { - soak: 1, - ..MonitoringLoad::default() - }, - ); - } -} - -fn emit_monitoring_entries( - out: &mut impl ProjectionSink, - start_minute: usize, - end_minute: usize, - load: MonitoringLoad, -) { - if end_minute <= start_minute { - return; - } - - let start_bucket = monitoring_bucket_for_minute(start_minute); - let end_bucket = monitoring_bucket_for_minute(end_minute.saturating_sub(1)); - for bucket in start_bucket..=end_bucket { - out.emit(MonitoringEntry { bucket, load }); - } -} - -fn push_manual_task_with( - work_order_idx: usize, - furnace_idx: usize, - interval: Option<(usize, usize)>, - kind: ManualTaskKind, - required_skills: SkillMask, - emit: &mut impl FnMut(ManualTaskDemand), -) { - let Some((start_minute, end_minute)) = interval else { - return; - }; - let Some(shift) = owning_shift_identity_for_interval(start_minute, end_minute) else { - return; - }; - emit(ManualTaskDemand { - work_order_idx, - furnace_idx, - shift, - kind, - start_minute, - end_minute, - required_skills, - }); -} - -fn push_manual_task_booking_with( - assignment: &FurnaceAssignment, - furnace_idx: usize, - interval: Option<(usize, usize)>, - kind: ManualTaskKind, - required_skills: SkillMask, - emit: &mut impl FnMut(ManualTaskBooking), -) { - let Some(operator_id) = assignment.task_operator_id(kind) else { - return; - }; - let Some((start_minute, end_minute)) = interval else { - return; - }; - let Some(shift) = owning_shift_identity_for_interval(start_minute, end_minute) else { - return; - }; - emit(ManualTaskBooking { - work_order_idx: assignment.work_order_idx, - furnace_idx, - operator_id, - shift, - kind, - start_minute, - end_minute, - required_skills, - }); } diff --git a/uc-furnace/src/domain/furnace_assignment.rs b/uc-furnace/src/domain/furnace_assignment.rs new file mode 100644 index 0000000..3f63fc2 --- /dev/null +++ b/uc-furnace/src/domain/furnace_assignment.rs @@ -0,0 +1,983 @@ +use solverforge::prelude::*; + +use super::changeover::calculate_changeover_cost_for_sequence; +use super::constants::{NUM_TIME_SLOTS, TIME_STEP}; +use super::enums::{HeatTreatmentProcess, OperatorSkill, PriorityBand, ShiftType}; +use super::plan::Plan; +use super::support::{ + HardViolation, ManualTaskBooking, ManualTaskDemand, ManualTaskKind, MonitoringEntry, + MonitoringLoad, ShiftIdentity, ShiftWorkEntry, SkillMask, +}; +use super::time::{ + heating_ramp_minutes, monitoring_bucket_for_minute, owning_shift_identity_for_interval, + owning_shift_identity_for_minute, shift_identities_for_interval, +}; + +#[planning_entity] +pub struct FurnaceAssignment { + #[planning_id] + pub work_order_idx: usize, + pub process: HeatTreatmentProcess, + pub temperature_celsius: u32, + pub soak_time_minutes: u32, + pub load_weight_kg: u32, + pub due_datetime_minutes: usize, + pub priority: PriorityBand, + pub requires_quench: bool, + pub compatible_assignments: Vec, + pub eligible_load_build_operator_ids: Vec, + pub eligible_program_operator_ids: Vec, + pub eligible_quench_operator_ids: Vec, + pub eligible_unload_operator_ids: Vec, + // @solverforge:begin entity-variables + #[planning_variable( + allows_unassigned = true, + value_range_provider = "compatible_assignments", + construction_entity_order_key = "furnace_assignment_construction_entity_order_key", + construction_value_order_key = "furnace_assignment_construction_value_order_key" + )] + pub assignment: Option, + #[planning_variable( + allows_unassigned = true, + value_range_provider = "eligible_load_build_operator_ids", + construction_entity_order_key = "task_operator_construction_entity_order_key", + construction_value_order_key = "load_build_operator_construction_value_order_key" + )] + pub load_build_operator_id: Option, + #[planning_variable( + allows_unassigned = true, + value_range_provider = "eligible_program_operator_ids", + construction_entity_order_key = "task_operator_construction_entity_order_key", + construction_value_order_key = "program_operator_construction_value_order_key" + )] + pub program_operator_id: Option, + #[planning_variable( + allows_unassigned = true, + value_range_provider = "eligible_quench_operator_ids", + construction_entity_order_key = "task_operator_construction_entity_order_key", + construction_value_order_key = "quench_operator_construction_value_order_key" + )] + pub quench_operator_id: Option, + #[planning_variable( + allows_unassigned = true, + value_range_provider = "eligible_unload_operator_ids", + construction_entity_order_key = "task_operator_construction_entity_order_key", + construction_value_order_key = "unload_operator_construction_value_order_key" + )] + pub unload_operator_id: Option, + // @solverforge:end entity-variables +} + +/// Constructor payload for `FurnaceAssignment`: the work order's fixed data and +/// the value ranges the solver chooses from. +#[derive(Debug, Clone)] +pub struct FurnaceAssignmentInit { + pub work_order_idx: usize, + pub process: HeatTreatmentProcess, + pub temperature_celsius: u32, + pub soak_time_minutes: u32, + pub load_weight_kg: u32, + pub due_datetime_minutes: usize, + pub priority: PriorityBand, + pub requires_quench: bool, + pub compatible_assignments: Vec, + pub eligible_load_build_operator_ids: Vec, + pub eligible_program_operator_ids: Vec, + pub eligible_quench_operator_ids: Vec, + pub eligible_unload_operator_ids: Vec, +} + +impl FurnaceAssignment { + /// Builds an unassigned furnace job; every planning variable starts empty. + pub fn new(init: FurnaceAssignmentInit) -> Self { + Self { + work_order_idx: init.work_order_idx, + process: init.process, + temperature_celsius: init.temperature_celsius, + soak_time_minutes: init.soak_time_minutes, + load_weight_kg: init.load_weight_kg, + due_datetime_minutes: init.due_datetime_minutes, + priority: init.priority, + requires_quench: init.requires_quench, + compatible_assignments: init.compatible_assignments, + eligible_load_build_operator_ids: init.eligible_load_build_operator_ids, + eligible_program_operator_ids: init.eligible_program_operator_ids, + eligible_quench_operator_ids: init.eligible_quench_operator_ids, + eligible_unload_operator_ids: init.eligible_unload_operator_ids, + // @solverforge:begin entity-variable-init + assignment: None, + load_build_operator_id: None, + program_operator_id: None, + quench_operator_id: None, + unload_operator_id: None, + // @solverforge:end entity-variable-init + } + } +} + +impl FurnaceAssignment { + pub fn is_scheduled(&self) -> bool { + self.assignment.is_some() + } + + pub fn furnace_idx(&self) -> Option { + self.assignment.map(|value| value / NUM_TIME_SLOTS) + } + + pub fn time_slot_idx(&self) -> Option { + self.assignment.map(|value| value % NUM_TIME_SLOTS) + } + + pub fn start_minutes(&self) -> Option { + self.time_slot_idx().map(|slot| slot * TIME_STEP) + } + + pub fn end_minutes(&self) -> Option { + self.start_minutes() + .map(|start| start + self.soak_time_minutes as usize) + } + + pub fn duration_minutes(&self) -> usize { + self.soak_time_minutes as usize + } + + pub fn priority_weight(&self) -> i64 { + self.priority.weight() + } + + pub fn start_shift_identity(&self) -> Option { + self.start_minutes() + .and_then(owning_shift_identity_for_minute) + } + + pub fn completion_shift_identity(&self) -> Option { + self.end_minutes() + .and_then(owning_shift_identity_for_minute) + } + + pub fn load_build_interval(&self) -> Option<(usize, usize)> { + let start = self.start_minutes()?; + let interval_start = start.saturating_sub(60); + let interval_end = start.saturating_sub(30); + (interval_end > interval_start).then_some((interval_start, interval_end)) + } + + pub fn program_interval(&self) -> Option<(usize, usize)> { + let start = self.start_minutes()?; + let interval_start = start.saturating_sub(15); + (start > interval_start).then_some((interval_start, start)) + } + + pub fn quench_interval(&self) -> Option<(usize, usize)> { + if !self.requires_quench { + return None; + } + let end = self.end_minutes()?; + Some((end, end + 15)) + } + + pub fn unload_interval(&self) -> Option<(usize, usize)> { + let end = self.end_minutes()?; + Some((end + 15, end + 30)) + } + + pub fn load_build_shift_identity(&self) -> Option { + self.load_build_interval() + .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) + } + + pub fn program_shift_identity(&self) -> Option { + self.program_interval() + .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) + } + + pub fn quench_shift_identity(&self) -> Option { + self.quench_interval() + .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) + } + + pub fn unload_shift_identity(&self) -> Option { + self.unload_interval() + .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) + } + + pub fn occupied_shift_identities(&self) -> Vec { + let Some(start) = self.start_minutes() else { + return Vec::new(); + }; + let Some(end) = self.end_minutes() else { + return Vec::new(); + }; + shift_identities_for_interval(start, end) + } + + pub fn task_interval(&self, kind: ManualTaskKind) -> Option<(usize, usize)> { + match kind { + ManualTaskKind::LoadBuild => self.load_build_interval(), + ManualTaskKind::Program => self.program_interval(), + ManualTaskKind::Quench => self.quench_interval(), + ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_interval(), + } + } + + pub fn task_shift_identity(&self, kind: ManualTaskKind) -> Option { + self.task_interval(kind) + .and_then(|(start, end)| owning_shift_identity_for_interval(start, end)) + } + + pub fn load_build_required_skills(&self) -> SkillMask { + SkillMask::empty().insert(OperatorSkill::LoadBuild) + } + + pub fn program_required_skills(&self) -> SkillMask { + SkillMask::empty().insert(OperatorSkill::FurnaceProgram) + } + + pub fn quench_required_skills(&self) -> SkillMask { + SkillMask::empty().insert(OperatorSkill::QuenchOperate) + } + + pub fn unload_required_skills(&self) -> SkillMask { + if self.load_weight_kg > 500 { + SkillMask::empty() + .insert(OperatorSkill::LoadBuild) + .insert(OperatorSkill::CraneForklift) + } else { + SkillMask::empty().insert(OperatorSkill::LoadBuild) + } + } + + pub fn task_required_skills(&self, kind: ManualTaskKind) -> SkillMask { + match kind { + ManualTaskKind::LoadBuild => self.load_build_required_skills(), + ManualTaskKind::Program => self.program_required_skills(), + ManualTaskKind::Quench => self.quench_required_skills(), + ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_required_skills(), + } + } + + pub fn unload_task_kind(&self) -> ManualTaskKind { + if self.load_weight_kg > 500 { + ManualTaskKind::HeavyUnload + } else { + ManualTaskKind::Unload + } + } + + pub fn task_operator_id(&self, kind: ManualTaskKind) -> Option { + match kind { + ManualTaskKind::LoadBuild => self.load_build_operator_id, + ManualTaskKind::Program => self.program_operator_id, + ManualTaskKind::Quench => self.quench_operator_id, + ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => self.unload_operator_id, + } + } + + pub fn task_eligible_operator_ids(&self, kind: ManualTaskKind) -> &[usize] { + match kind { + ManualTaskKind::LoadBuild => &self.eligible_load_build_operator_ids, + ManualTaskKind::Program => &self.eligible_program_operator_ids, + ManualTaskKind::Quench => &self.eligible_quench_operator_ids, + ManualTaskKind::Unload | ManualTaskKind::HeavyUnload => { + &self.eligible_unload_operator_ids + } + } + } + + pub fn required_task_kinds(&self) -> Vec { + if !self.is_scheduled() { + return Vec::new(); + } + + let mut kinds = Vec::with_capacity(4); + if self.load_build_interval().is_some() { + kinds.push(ManualTaskKind::LoadBuild); + } + if self.program_interval().is_some() { + kinds.push(ManualTaskKind::Program); + } + if self.quench_interval().is_some() { + kinds.push(ManualTaskKind::Quench); + } + if self.unload_interval().is_some() { + kinds.push(self.unload_task_kind()); + } + kinds + } + + pub fn manual_task_demands(&self) -> Vec { + let mut demands = Vec::new(); + self.for_each_manual_task_demand(|demand| demands.push(demand)); + demands + } + + pub fn for_each_manual_task_demand(&self, mut emit: impl FnMut(ManualTaskDemand)) { + let Some(furnace_idx) = self.furnace_idx() else { + return; + }; + + push_manual_task_with( + self.work_order_idx, + furnace_idx, + self.load_build_interval(), + ManualTaskKind::LoadBuild, + self.load_build_required_skills(), + &mut emit, + ); + push_manual_task_with( + self.work_order_idx, + furnace_idx, + self.program_interval(), + ManualTaskKind::Program, + self.program_required_skills(), + &mut emit, + ); + push_manual_task_with( + self.work_order_idx, + furnace_idx, + self.quench_interval(), + ManualTaskKind::Quench, + self.quench_required_skills(), + &mut emit, + ); + push_manual_task_with( + self.work_order_idx, + furnace_idx, + self.unload_interval(), + self.unload_task_kind(), + self.unload_required_skills(), + &mut emit, + ); + } + + pub fn manual_task_bookings(&self) -> Vec { + let mut bookings = Vec::new(); + self.for_each_manual_task_booking(|booking| bookings.push(booking)); + bookings + } + + pub fn for_each_manual_task_booking(&self, mut emit: impl FnMut(ManualTaskBooking)) { + let Some(furnace_idx) = self.furnace_idx() else { + return; + }; + + push_manual_task_booking_with( + self, + furnace_idx, + self.load_build_interval(), + ManualTaskKind::LoadBuild, + self.load_build_required_skills(), + &mut emit, + ); + push_manual_task_booking_with( + self, + furnace_idx, + self.program_interval(), + ManualTaskKind::Program, + self.program_required_skills(), + &mut emit, + ); + push_manual_task_booking_with( + self, + furnace_idx, + self.quench_interval(), + ManualTaskKind::Quench, + self.quench_required_skills(), + &mut emit, + ); + push_manual_task_booking_with( + self, + furnace_idx, + self.unload_interval(), + self.unload_task_kind(), + self.unload_required_skills(), + &mut emit, + ); + } + + pub fn task_operator_range_violations(&self) -> Vec { + [ + (ManualTaskKind::LoadBuild, self.load_build_operator_id), + (ManualTaskKind::Program, self.program_operator_id), + (ManualTaskKind::Quench, self.quench_operator_id), + (self.unload_task_kind(), self.unload_operator_id), + ] + .into_iter() + .filter_map(|(kind, operator_id)| { + let operator_id = operator_id?; + (!self.task_eligible_operator_ids(kind).contains(&operator_id)) + .then_some(HardViolation { weight: 900 }) + }) + .collect() + } + + pub fn finalize(&mut self) {} +} + +pub(crate) fn furnace_assignment_construction_entity_order_key( + _plan: &Plan, + assignment: &FurnaceAssignment, +) -> i64 { + let range_size = assignment.compatible_assignments.len() as i64; + let due = assignment.due_datetime_minutes as i64; + let duration = assignment.duration_minutes() as i64; + -due.saturating_mul(10_000) - range_size.saturating_mul(100) + duration +} + +pub(crate) fn furnace_assignment_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + value: usize, +) -> i64 { + if assignment.assignment == Some(value) { + return i64::MIN; + } + + let furnace_idx = value / NUM_TIME_SLOTS; + let slot_idx = value % NUM_TIME_SLOTS; + let start = slot_idx * TIME_STEP; + let end = start + assignment.duration_minutes(); + let due_distance = assignment.due_datetime_minutes.abs_diff(end) as i64; + let schedule_conflict = + furnace_candidate_schedule_conflict(plan, assignment, furnace_idx, start, end); + let shift_gap = usize::from(candidate_has_shift_ownership_gap(assignment, start, end)) as i64; + let rotated_furnace_rank = if plan.furnaces.is_empty() { + 0 + } else { + ((furnace_idx + assignment.work_order_idx) % plan.furnaces.len()) as i64 + }; + + schedule_conflict.saturating_mul(100_000_000) + + shift_gap.saturating_mul(10_000_000) + + due_distance.saturating_mul(1_000) + + start as i64 + + rotated_furnace_rank +} + +pub(crate) fn furnace_assignment_local_search_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + value: usize, +) -> i64 { + if assignment.assignment == Some(value) { + return i64::MIN; + } + + let furnace_idx = value / NUM_TIME_SLOTS; + let slot_idx = value % NUM_TIME_SLOTS; + let start = slot_idx * TIME_STEP; + let end = start + assignment.duration_minutes(); + let timing_penalty = furnace_candidate_timing_soft_proxy(assignment, start, end); + let schedule_conflict = + furnace_candidate_schedule_conflict(plan, assignment, furnace_idx, start, end); + let shift_gap = usize::from(candidate_has_shift_ownership_gap(assignment, start, end)) as i64; + let rotated_furnace_rank = if plan.furnaces.is_empty() { + 0 + } else { + ((furnace_idx + assignment.work_order_idx) % plan.furnaces.len()) as i64 + }; + + schedule_conflict.saturating_mul(100_000_000) + + shift_gap.saturating_mul(10_000_000) + + timing_penalty.saturating_mul(10_000) + + start as i64 + + rotated_furnace_rank +} + +fn furnace_candidate_timing_soft_proxy( + assignment: &FurnaceAssignment, + start: usize, + end: usize, +) -> i64 { + let due_penalty = if end > assignment.due_datetime_minutes { + (end - assignment.due_datetime_minutes) as i64 * priority_lateness_multiplier(assignment) + } else { + ((assignment.due_datetime_minutes - end) as i64) / 40 + }; + due_penalty + night_start_penalty(assignment, start) +} + +fn priority_lateness_multiplier(assignment: &FurnaceAssignment) -> i64 { + match assignment.priority { + PriorityBand::Express => 60, + PriorityBand::Urgent => 20, + PriorityBand::Standard => 5, + } +} + +fn night_start_penalty(assignment: &FurnaceAssignment, start: usize) -> i64 { + let starts_at_night = owning_shift_identity_for_minute(start) + .is_some_and(|shift| shift.shift_type == ShiftType::Night); + if !starts_at_night + || matches!( + assignment.process, + HeatTreatmentProcess::Carburizing | HeatTreatmentProcess::Nitriding + ) + { + return 0; + } + match assignment.priority { + PriorityBand::Express => 40, + PriorityBand::Urgent => 70, + PriorityBand::Standard => 120, + } +} + +fn furnace_candidate_schedule_conflict( + plan: &Plan, + assignment: &FurnaceAssignment, + furnace_idx: usize, + start: usize, + end: usize, +) -> i64 { + let mut penalty = 0_i64; + for other in &plan.assignments { + if other.work_order_idx == assignment.work_order_idx + || other.furnace_idx() != Some(furnace_idx) + { + continue; + } + let Some(other_start) = other.start_minutes() else { + continue; + }; + let Some(other_end) = other.end_minutes() else { + continue; + }; + + if start < other_end && other_start < end { + penalty = penalty + .saturating_add(10_000 + overlap_minutes(start, end, other_start, other_end)); + continue; + } + if other_end <= start { + let required_gap = calculate_changeover_cost_for_sequence(other, assignment) as usize; + if start - other_end < required_gap { + penalty = penalty.saturating_add((required_gap - (start - other_end)) as i64); + } + } else if end <= other_start { + let required_gap = calculate_changeover_cost_for_sequence(assignment, other) as usize; + if other_start - end < required_gap { + penalty = penalty.saturating_add((required_gap - (other_start - end)) as i64); + } + } + } + penalty +} + +fn overlap_minutes( + left_start: usize, + left_end: usize, + right_start: usize, + right_end: usize, +) -> i64 { + left_end + .min(right_end) + .saturating_sub(left_start.max(right_start)) as i64 +} + +pub(crate) fn task_operator_construction_entity_order_key( + _plan: &Plan, + assignment: &FurnaceAssignment, +) -> i64 { + let start = assignment.start_minutes().unwrap_or(usize::MAX) as i64; + let range_size = [ + assignment.eligible_load_build_operator_ids.len(), + assignment.eligible_program_operator_ids.len(), + assignment.eligible_quench_operator_ids.len(), + assignment.eligible_unload_operator_ids.len(), + ] + .into_iter() + .filter(|size| *size > 0) + .min() + .unwrap_or(usize::MAX) as i64; + + start.saturating_mul(10_000) + range_size.saturating_mul(100) + assignment.work_order_idx as i64 +} + +pub(crate) fn load_build_operator_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + operator_id: usize, +) -> i64 { + task_operator_construction_value_order_key( + plan, + assignment, + ManualTaskKind::LoadBuild, + operator_id, + ) +} + +pub(crate) fn program_operator_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + operator_id: usize, +) -> i64 { + task_operator_construction_value_order_key( + plan, + assignment, + ManualTaskKind::Program, + operator_id, + ) +} + +pub(crate) fn quench_operator_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + operator_id: usize, +) -> i64 { + task_operator_construction_value_order_key( + plan, + assignment, + ManualTaskKind::Quench, + operator_id, + ) +} + +pub(crate) fn unload_operator_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + operator_id: usize, +) -> i64 { + task_operator_construction_value_order_key( + plan, + assignment, + assignment.unload_task_kind(), + operator_id, + ) +} + +fn task_operator_construction_value_order_key( + plan: &Plan, + assignment: &FurnaceAssignment, + kind: ManualTaskKind, + operator_id: usize, +) -> i64 { + let shift_fit = assignment + .task_shift_identity(kind) + .map(|shift| operator_shift_fit(plan, operator_id, shift)) + .unwrap_or(9); + let shift_conflict = assignment + .task_shift_identity(kind) + .map(|shift| operator_existing_shift_conflict(plan, operator_id, shift)) + .unwrap_or(0); + let overlap_conflict = assignment + .task_interval(kind) + .map(|(start, end)| operator_existing_task_overlap(plan, operator_id, start, end)) + .unwrap_or(0); + let current_task_count = plan + .assignments + .iter() + .filter(|other| { + [ + other.load_build_operator_id, + other.program_operator_id, + other.quench_operator_id, + other.unload_operator_id, + ] + .contains(&Some(operator_id)) + }) + .count() as i64; + + shift_conflict.saturating_mul(100_000_000) + + overlap_conflict.saturating_mul(10_000_000) + + shift_fit.saturating_mul(1_000_000) + + current_task_count.saturating_mul(1_000) + + operator_id as i64 +} + +fn operator_shift_fit(plan: &Plan, operator_id: usize, shift: ShiftIdentity) -> i64 { + let Some(shift_assignment) = plan.operator_shift_assignments.iter().find(|assignment| { + assignment.operator_idx == operator_id && assignment.roster_day == shift.roster_day + }) else { + return 9; + }; + + if shift_assignment.shift_id() == Some(shift.shift_id) { + 0 + } else if shift_assignment + .allowed_shift_types + .contains(&shift.shift_type.index()) + { + 1 + } else { + 9 + } +} + +fn operator_existing_shift_conflict(plan: &Plan, operator_id: usize, shift: ShiftIdentity) -> i64 { + for assignment in &plan.assignments { + for kind in assignment.required_task_kinds() { + if assignment.task_operator_id(kind) != Some(operator_id) { + continue; + } + let Some(existing_shift) = assignment.task_shift_identity(kind) else { + continue; + }; + if existing_shift.roster_day == shift.roster_day + && existing_shift.shift_id != shift.shift_id + { + return 1; + } + } + } + 0 +} + +fn operator_existing_task_overlap( + plan: &Plan, + operator_id: usize, + start: usize, + end: usize, +) -> i64 { + for assignment in &plan.assignments { + for kind in assignment.required_task_kinds() { + if assignment.task_operator_id(kind) != Some(operator_id) { + continue; + } + let Some((existing_start, existing_end)) = assignment.task_interval(kind) else { + continue; + }; + if start < existing_end && existing_start < end { + return 1; + } + } + } + 0 +} + +fn candidate_has_shift_ownership_gap( + assignment: &FurnaceAssignment, + start: usize, + end: usize, +) -> bool { + let load_build = (start >= 60) + .then(|| (start - 60, start - 30)) + .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); + let program = (start >= 15) + .then(|| (start - 15, start)) + .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); + let quench = assignment + .requires_quench + .then_some((end, end + 15)) + .and_then(|interval| owning_shift_identity_for_interval(interval.0, interval.1)); + let unload = owning_shift_identity_for_interval(end + 15, end + 30); + + load_build.is_none() + || program.is_none() + || (assignment.requires_quench && quench.is_none()) + || unload.is_none() +} + +pub struct AssignedTaskCapacityEntries; + +impl Projection for AssignedTaskCapacityEntries { + type Out = MonitoringEntry; + const MAX_EMITS: usize = 2_688; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + assignment.for_each_manual_task_booking(|booking| { + emit_monitoring_entries( + out, + booking.start_minute, + booking.end_minute, + MonitoringLoad { + task: 1, + ..MonitoringLoad::default() + }, + ); + }); + } +} + +pub struct ManualTaskBookingEntries; + +impl Projection for ManualTaskBookingEntries { + type Out = ManualTaskBooking; + const MAX_EMITS: usize = 4; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + assignment.for_each_manual_task_booking(|booking| out.emit(booking)); + } +} + +pub struct TaskShiftWorkEntries; + +impl Projection for TaskShiftWorkEntries { + type Out = ShiftWorkEntry; + const MAX_EMITS: usize = 4; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + assignment.for_each_manual_task_booking(|booking| { + out.emit(ShiftWorkEntry { + operator_id: booking.operator_id, + shift_id: booking.shift.shift_id, + delta: 1, + }); + }); + } +} + +pub struct AssignedTaskWithoutScheduleViolations; + +impl Projection for AssignedTaskWithoutScheduleViolations { + type Out = HardViolation; + const MAX_EMITS: usize = 4; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + if assignment.assignment.is_some() { + return; + } + let assigned_count = [ + assignment.load_build_operator_id, + assignment.program_operator_id, + assignment.quench_operator_id, + assignment.unload_operator_id, + ] + .into_iter() + .filter(Option::is_some) + .count(); + for _ in 0..assigned_count { + out.emit(HardViolation { weight: 900 }); + } + } +} + +pub struct MissingTaskOperatorViolations; + +impl Projection for MissingTaskOperatorViolations { + type Out = HardViolation; + const MAX_EMITS: usize = 4; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + for kind in assignment.required_task_kinds() { + if assignment.task_operator_id(kind).is_none() { + out.emit(HardViolation { weight: 4_500 }); + } + } + } +} + +pub struct MonitoringDemandEntries; + +impl Projection for MonitoringDemandEntries { + type Out = MonitoringEntry; + const MAX_EMITS: usize = 1_344; + + fn project(&self, assignment: &FurnaceAssignment, out: &mut Sink) + where + Sink: ProjectionSink, + { + let Some(start) = assignment.start_minutes() else { + return; + }; + let Some(end) = assignment.end_minutes() else { + return; + }; + + let ramp_end = start + heating_ramp_minutes(assignment.duration_minutes()); + emit_monitoring_entries( + out, + start, + ramp_end, + MonitoringLoad { + ramp: 1, + ..MonitoringLoad::default() + }, + ); + emit_monitoring_entries( + out, + ramp_end, + end, + MonitoringLoad { + soak: 1, + ..MonitoringLoad::default() + }, + ); + } +} + +fn emit_monitoring_entries( + out: &mut impl ProjectionSink, + start_minute: usize, + end_minute: usize, + load: MonitoringLoad, +) { + if end_minute <= start_minute { + return; + } + + let start_bucket = monitoring_bucket_for_minute(start_minute); + let end_bucket = monitoring_bucket_for_minute(end_minute.saturating_sub(1)); + for bucket in start_bucket..=end_bucket { + out.emit(MonitoringEntry { bucket, load }); + } +} + +fn push_manual_task_with( + work_order_idx: usize, + furnace_idx: usize, + interval: Option<(usize, usize)>, + kind: ManualTaskKind, + required_skills: SkillMask, + emit: &mut impl FnMut(ManualTaskDemand), +) { + let Some((start_minute, end_minute)) = interval else { + return; + }; + let Some(shift) = owning_shift_identity_for_interval(start_minute, end_minute) else { + return; + }; + emit(ManualTaskDemand { + work_order_idx, + furnace_idx, + shift, + kind, + start_minute, + end_minute, + required_skills, + }); +} + +fn push_manual_task_booking_with( + assignment: &FurnaceAssignment, + furnace_idx: usize, + interval: Option<(usize, usize)>, + kind: ManualTaskKind, + required_skills: SkillMask, + emit: &mut impl FnMut(ManualTaskBooking), +) { + let Some(operator_id) = assignment.task_operator_id(kind) else { + return; + }; + let Some((start_minute, end_minute)) = interval else { + return; + }; + let Some(shift) = owning_shift_identity_for_interval(start_minute, end_minute) else { + return; + }; + emit(ManualTaskBooking { + work_order_idx: assignment.work_order_idx, + furnace_idx, + operator_id, + shift, + kind, + start_minute, + end_minute, + required_skills, + }); +} diff --git a/uc-furnace/src/domain/mod.rs b/uc-furnace/src/domain/mod.rs index 1308fda..277ce32 100644 --- a/uc-furnace/src/domain/mod.rs +++ b/uc-furnace/src/domain/mod.rs @@ -8,22 +8,30 @@ mod workforce; solverforge::planning_model! { root = "src/domain"; - mod plan; - mod resources; + // @solverforge:begin domain-exports mod furnace; - mod coverage; + mod work_order; + mod operator; + mod shift; + mod shift_coverage_demand; + mod furnace_assignment; + mod operator_shift_assignment; + mod plan; + pub use furnace::Furnace; + pub use work_order::WorkOrder; + pub use operator::Operator; + pub use shift::Shift; + pub use shift_coverage_demand::ShiftCoverageDemand; + pub use furnace_assignment::FurnaceAssignment; + pub use furnace_assignment::FurnaceAssignmentInit; + pub use operator_shift_assignment::OperatorShiftAssignment; + pub use operator_shift_assignment::OperatorShiftAssignmentInit; pub use plan::Plan; + // @solverforge:end domain-exports } -pub(crate) use self::coverage::{ - operator_shift_construction_entity_order_key, operator_shift_construction_value_order_key, -}; -pub(crate) use self::coverage::{ - OperatorMonitoringCapacityEntries, OperatorNightWindowEntries, OperatorShiftAssignment, - OperatorShiftCoverageEntries, OperatorTaskShiftWorkEntries, -}; -pub(crate) use self::furnace::{ +pub(crate) use self::furnace_assignment::{ furnace_assignment_construction_entity_order_key, furnace_assignment_construction_value_order_key, furnace_assignment_local_search_value_order_key, @@ -31,15 +39,19 @@ pub(crate) use self::furnace::{ program_operator_construction_value_order_key, quench_operator_construction_value_order_key, task_operator_construction_entity_order_key, unload_operator_construction_value_order_key, }; -pub(crate) use self::furnace::{ - AssignedTaskCapacityEntries, AssignedTaskWithoutScheduleViolations, FurnaceAssignment, - ManualTaskBookingEntries, MissingTaskOperatorViolations, MonitoringDemandEntries, - TaskShiftWorkEntries, +pub(crate) use self::furnace_assignment::{ + AssignedTaskCapacityEntries, AssignedTaskWithoutScheduleViolations, ManualTaskBookingEntries, + MissingTaskOperatorViolations, MonitoringDemandEntries, TaskShiftWorkEntries, }; -pub(crate) use self::plan::PlanConstraintStreams; -pub(crate) use self::resources::{ - Furnace, Operator, Shift, ShiftCoverageDemand, ShiftCoverageEntries, WorkOrder, +pub(crate) use self::operator_shift_assignment::{ + operator_shift_construction_entity_order_key, operator_shift_construction_value_order_key, }; +pub(crate) use self::operator_shift_assignment::{ + OperatorMonitoringCapacityEntries, OperatorNightWindowEntries, OperatorShiftCoverageEntries, + OperatorTaskShiftWorkEntries, +}; +pub(crate) use self::plan::PlanConstraintStreams; +pub(crate) use self::shift_coverage_demand::ShiftCoverageEntries; pub(crate) use changeover::calculate_changeover_cost_for_sequence; pub(crate) use constants::*; pub(crate) use enums::*; diff --git a/uc-furnace/src/domain/operator.rs b/uc-furnace/src/domain/operator.rs new file mode 100644 index 0000000..65a1c71 --- /dev/null +++ b/uc-furnace/src/domain/operator.rs @@ -0,0 +1,19 @@ +use solverforge::prelude::*; + +use super::enums::{OperatorRole, OperatorSkill}; +use super::support::SkillMask; + +#[problem_fact] +pub struct Operator { + #[planning_id] + pub id: usize, + pub name: &'static str, + pub role: OperatorRole, + pub day_only: bool, + pub skills: &'static [OperatorSkill], + pub skill_mask: SkillMask, +} + +impl Operator { + pub fn finalize(&mut self) {} +} diff --git a/uc-furnace/src/domain/coverage.rs b/uc-furnace/src/domain/operator_shift_assignment.rs similarity index 92% rename from uc-furnace/src/domain/coverage.rs rename to uc-furnace/src/domain/operator_shift_assignment.rs index 7c2b346..cd19589 100644 --- a/uc-furnace/src/domain/coverage.rs +++ b/uc-furnace/src/domain/operator_shift_assignment.rs @@ -24,6 +24,7 @@ pub struct OperatorShiftAssignment { pub roster_day: RosterDay, pub skill_mask: SkillMask, pub allowed_shift_types: Vec, + // @solverforge:begin entity-variables #[planning_variable( allows_unassigned = true, value_range_provider = "allowed_shift_types", @@ -31,6 +32,40 @@ pub struct OperatorShiftAssignment { construction_value_order_key = "operator_shift_construction_value_order_key" )] pub shift_type: Option, + // @solverforge:end entity-variables +} + +/// Constructor payload for `OperatorShiftAssignment`: one operator's roster day +/// and the shift types they may work on it. +#[derive(Debug, Clone)] +pub struct OperatorShiftAssignmentInit { + pub id: usize, + pub operator_idx: usize, + pub operator_name: &'static str, + pub role: OperatorRole, + pub day_only: bool, + pub roster_day: RosterDay, + pub skill_mask: SkillMask, + pub allowed_shift_types: Vec, +} + +impl OperatorShiftAssignment { + /// Builds an unrostered operator day; the shift type starts empty. + pub fn new(init: OperatorShiftAssignmentInit) -> Self { + Self { + id: init.id, + operator_idx: init.operator_idx, + operator_name: init.operator_name, + role: init.role, + day_only: init.day_only, + roster_day: init.roster_day, + skill_mask: init.skill_mask, + allowed_shift_types: init.allowed_shift_types, + // @solverforge:begin entity-variable-init + shift_type: None, + // @solverforge:end entity-variable-init + } + } } impl OperatorShiftAssignment { diff --git a/uc-furnace/src/domain/plan.rs b/uc-furnace/src/domain/plan.rs index 1037304..6594dbd 100644 --- a/uc-furnace/src/domain/plan.rs +++ b/uc-furnace/src/domain/plan.rs @@ -1,17 +1,24 @@ use solverforge::prelude::*; -use super::{ - Furnace, FurnaceAssignment, Operator, OperatorShiftAssignment, Shift, ShiftCoverageDemand, - ShiftId, WorkOrder, -}; +// @solverforge:begin solution-imports +use super::Furnace; +use super::FurnaceAssignment; +use super::Operator; +use super::OperatorShiftAssignment; +use super::Shift; +use super::ShiftCoverageDemand; +use super::WorkOrder; +// @solverforge:end solution-imports +use super::ShiftId; #[planning_solution( constraints = "crate::constraints::create_constraints", solver_toml = "../../solver.toml", - conflict_repairs = "crate::solver::conflict_repair::providers", - scalar_groups = "crate::solver::scalar_groups::groups" + scalar_groups = "scalar_groups", + conflict_repairs = "conflict_repairs" )] pub struct Plan { + // @solverforge:begin solution-collections #[problem_fact_collection] pub furnaces: Vec, #[problem_fact_collection] @@ -26,11 +33,39 @@ pub struct Plan { pub assignments: Vec, #[planning_entity_collection] pub operator_shift_assignments: Vec, + // @solverforge:end solution-collections #[planning_score] pub score: Option, } impl Plan { + /// Builds an unsolved plan from its facts and planning entities. + #[rustfmt::skip] + pub fn new( + // @solverforge:begin solution-constructor-params + furnaces: Vec, + work_orders: Vec, + operators: Vec, + shifts: Vec, + shift_coverage_demands: Vec, + assignments: Vec, + operator_shift_assignments: Vec, + // @solverforge:end solution-constructor-params + ) -> Self { + Self { + // @solverforge:begin solution-constructor-init + furnaces, + work_orders, + operators, + shifts, + shift_coverage_demands, + assignments, + operator_shift_assignments, + // @solverforge:end solution-constructor-init + score: None, + } + } + pub fn furnace(&self, idx: usize) -> &Furnace { &self.furnaces[idx] } @@ -49,3 +84,76 @@ impl Plan { .filter(|shift| shift.id == shift_id) } } + +// @solverforge:begin scalar-groups +pub(super) fn scalar_groups() -> Vec> { + vec![ + ScalarGroup::candidates( + "furnace_assignment", + vec![Plan::assignments().scalar("assignment")], + crate::solver::scalar_groups::furnace_assignment_candidates, + ), + ScalarGroup::candidates( + "roster_shift_assignment", + vec![Plan::operator_shift_assignments().scalar("shift_type")], + crate::solver::scalar_groups::roster_shift_assignment_candidates, + ), + ScalarGroup::candidates( + "task_operator_assignment", + vec![ + Plan::assignments().scalar("load_build_operator_id"), + Plan::assignments().scalar("program_operator_id"), + Plan::assignments().scalar("quench_operator_id"), + Plan::assignments().scalar("unload_operator_id"), + ], + crate::solver::scalar_groups::task_operator_assignment_candidates, + ), + ScalarGroup::candidates( + "furnace_schedule_task_assignment", + vec![ + Plan::assignments().scalar("assignment"), + Plan::assignments().scalar("load_build_operator_id"), + Plan::assignments().scalar("program_operator_id"), + Plan::assignments().scalar("quench_operator_id"), + Plan::assignments().scalar("unload_operator_id"), + ], + crate::solver::scalar_groups::furnace_schedule_task_assignment_candidates, + ), + ] +} +// @solverforge:end scalar-groups + +// @solverforge:begin conflict-repairs +pub(super) fn conflict_repairs() -> Vec> { + vec![ + ConflictRepair::new( + "minimum_rest", + crate::solver::conflict_repair::minimum_rest_repairs, + ), + ConflictRepair::new( + "visible_shift_limit", + crate::solver::conflict_repair::visible_shift_limit_repairs, + ), + ConflictRepair::new( + "task_operator_on_owning_shift", + crate::solver::conflict_repair::task_owning_shift_repairs, + ), + ConflictRepair::new( + "shift_role_coverage", + crate::solver::conflict_repair::shift_role_coverage_repairs, + ), + ConflictRepair::new( + "monitoring_capacity", + crate::solver::conflict_repair::monitoring_capacity_repairs, + ), + ConflictRepair::new( + "furnace_overlap", + crate::solver::conflict_repair::furnace_overlap_repairs, + ), + ConflictRepair::new( + "changeover_gap", + crate::solver::conflict_repair::changeover_gap_repairs, + ), + ] +} +// @solverforge:end conflict-repairs diff --git a/uc-furnace/src/domain/resources.rs b/uc-furnace/src/domain/resources.rs deleted file mode 100644 index caabf31..0000000 --- a/uc-furnace/src/domain/resources.rs +++ /dev/null @@ -1,138 +0,0 @@ -use solverforge::prelude::*; - -use super::constants::RosterDay; -use super::enums::{ - FurnaceType, HeatTreatmentProcess, OperatorRole, OperatorSkill, PriorityBand, ShiftType, -}; -use super::support::{ShiftCoverageEntry, ShiftIdentity, SkillMask}; -use super::time::{canonical_shift_label, canonical_shift_time_label}; - -#[problem_fact] -pub struct Furnace { - #[planning_id] - pub id: usize, - pub name: &'static str, - pub max_temp_celsius: u32, - pub max_load_kg: u32, - pub furnace_type: FurnaceType, - pub heating_rate_c_per_minute: u32, - pub cooling_rate_c_per_minute: u32, - pub supported_processes: &'static [HeatTreatmentProcess], -} - -impl Furnace { - pub fn finalize(&mut self) {} -} - -impl Furnace { - pub fn supports_process(&self, process: HeatTreatmentProcess) -> bool { - self.supported_processes.contains(&process) - } - - pub fn supports_temperature(&self, temperature_celsius: u32) -> bool { - temperature_celsius <= self.max_temp_celsius - } - - pub fn supports_load(&self, load_weight_kg: u32) -> bool { - load_weight_kg <= self.max_load_kg - } -} - -#[problem_fact] -pub struct WorkOrder { - #[planning_id] - pub id: usize, - pub order_code: &'static str, - pub customer: &'static str, - pub part_description: &'static str, - pub material: &'static str, - pub process: HeatTreatmentProcess, - pub temperature_celsius: u32, - pub soak_time_minutes: u32, - pub load_weight_kg: u32, - pub due_datetime_minutes: usize, - pub priority: PriorityBand, - pub requires_quench: bool, -} - -impl WorkOrder { - pub fn finalize(&mut self) {} -} - -#[problem_fact] -pub struct Operator { - #[planning_id] - pub id: usize, - pub name: &'static str, - pub role: OperatorRole, - pub day_only: bool, - pub skills: &'static [OperatorSkill], - pub skill_mask: SkillMask, -} - -impl Operator { - pub fn finalize(&mut self) {} -} - -#[problem_fact] -pub struct Shift { - #[planning_id] - pub id: usize, - pub roster_day: RosterDay, - pub shift_type: ShiftType, - pub start_minute: usize, - pub end_minute: usize, -} - -impl Shift { - pub fn identity(&self) -> ShiftIdentity { - ShiftIdentity { - shift_id: self.id, - roster_day: self.roster_day, - shift_type: self.shift_type, - } - } - - pub fn label(&self) -> String { - canonical_shift_label(self.roster_day, self.shift_type) - } - - pub fn time_label(&self) -> String { - canonical_shift_time_label(self.roster_day, self.shift_type, self.end_minute) - } - - pub fn finalize(&mut self) {} -} - -#[problem_fact] -pub struct ShiftCoverageDemand { - #[planning_id] - pub id: usize, - pub shift_id: usize, - pub roster_day: RosterDay, - pub shift_type: ShiftType, - pub role: OperatorRole, - pub required_count: i64, -} - -impl ShiftCoverageDemand { - pub fn finalize(&mut self) {} -} - -pub struct ShiftCoverageEntries; - -impl Projection for ShiftCoverageEntries { - type Out = ShiftCoverageEntry; - const MAX_EMITS: usize = 1; - - fn project(&self, demand: &ShiftCoverageDemand, out: &mut Sink) - where - Sink: ProjectionSink, - { - out.emit(ShiftCoverageEntry { - shift_id: demand.shift_id, - role: demand.role, - delta: demand.required_count, - }); - } -} diff --git a/uc-furnace/src/domain/shift.rs b/uc-furnace/src/domain/shift.rs new file mode 100644 index 0000000..f18ce4c --- /dev/null +++ b/uc-furnace/src/domain/shift.rs @@ -0,0 +1,36 @@ +use solverforge::prelude::*; + +use super::constants::RosterDay; +use super::enums::ShiftType; +use super::support::ShiftIdentity; +use super::time::{canonical_shift_label, canonical_shift_time_label}; + +#[problem_fact] +pub struct Shift { + #[planning_id] + pub id: usize, + pub roster_day: RosterDay, + pub shift_type: ShiftType, + pub start_minute: usize, + pub end_minute: usize, +} + +impl Shift { + pub fn identity(&self) -> ShiftIdentity { + ShiftIdentity { + shift_id: self.id, + roster_day: self.roster_day, + shift_type: self.shift_type, + } + } + + pub fn label(&self) -> String { + canonical_shift_label(self.roster_day, self.shift_type) + } + + pub fn time_label(&self) -> String { + canonical_shift_time_label(self.roster_day, self.shift_type, self.end_minute) + } + + pub fn finalize(&mut self) {} +} diff --git a/uc-furnace/src/domain/shift_coverage_demand.rs b/uc-furnace/src/domain/shift_coverage_demand.rs new file mode 100644 index 0000000..3a0f434 --- /dev/null +++ b/uc-furnace/src/domain/shift_coverage_demand.rs @@ -0,0 +1,38 @@ +use solverforge::prelude::*; + +use super::constants::RosterDay; +use super::enums::{OperatorRole, ShiftType}; +use super::support::ShiftCoverageEntry; + +#[problem_fact] +pub struct ShiftCoverageDemand { + #[planning_id] + pub id: usize, + pub shift_id: usize, + pub roster_day: RosterDay, + pub shift_type: ShiftType, + pub role: OperatorRole, + pub required_count: i64, +} + +impl ShiftCoverageDemand { + pub fn finalize(&mut self) {} +} + +pub struct ShiftCoverageEntries; + +impl Projection for ShiftCoverageEntries { + type Out = ShiftCoverageEntry; + const MAX_EMITS: usize = 1; + + fn project(&self, demand: &ShiftCoverageDemand, out: &mut Sink) + where + Sink: ProjectionSink, + { + out.emit(ShiftCoverageEntry { + shift_id: demand.shift_id, + role: demand.role, + delta: demand.required_count, + }); + } +} diff --git a/uc-furnace/src/domain/time.rs b/uc-furnace/src/domain/time.rs index 831b578..1f58779 100644 --- a/uc-furnace/src/domain/time.rs +++ b/uc-furnace/src/domain/time.rs @@ -3,8 +3,9 @@ use super::constants::{ STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, TIME_STEP, }; use super::enums::ShiftType; -use super::resources::{Furnace, WorkOrder}; +use super::furnace::Furnace; use super::support::ShiftIdentity; +use super::work_order::WorkOrder; pub fn shift_id_for_roster_day_and_type( roster_day: RosterDay, diff --git a/uc-furnace/src/domain/work_order.rs b/uc-furnace/src/domain/work_order.rs new file mode 100644 index 0000000..c13f1f6 --- /dev/null +++ b/uc-furnace/src/domain/work_order.rs @@ -0,0 +1,24 @@ +use solverforge::prelude::*; + +use super::enums::{HeatTreatmentProcess, PriorityBand}; + +#[problem_fact] +pub struct WorkOrder { + #[planning_id] + pub id: usize, + pub order_code: &'static str, + pub customer: &'static str, + pub part_description: &'static str, + pub material: &'static str, + pub process: HeatTreatmentProcess, + pub temperature_celsius: u32, + pub soak_time_minutes: u32, + pub load_weight_kg: u32, + pub due_datetime_minutes: usize, + pub priority: PriorityBand, + pub requires_quench: bool, +} + +impl WorkOrder { + pub fn finalize(&mut self) {} +} diff --git a/uc-furnace/src/domain/workforce.rs b/uc-furnace/src/domain/workforce.rs index 5badc62..b9c78f1 100644 --- a/uc-furnace/src/domain/workforce.rs +++ b/uc-furnace/src/domain/workforce.rs @@ -2,8 +2,8 @@ use super::constants::{ RosterDay, CARRY_OUT_END_MINUTE, MINUTES_PER_DAY, OFF_SHIFT_VALUE, STAFFING_ROSTER_DAY_END, STAFFING_ROSTER_DAY_START, }; -use super::coverage::OperatorShiftAssignment; use super::enums::{HeatTreatmentProcess, OperatorRole, OperatorSkill, ShiftType}; +use super::operator_shift_assignment::OperatorShiftAssignment; use super::support::SkillMask; use super::time::{shift_display_start_minute, shift_id_for_roster_day_and_type}; diff --git a/uc-furnace/src/solver/conflict_repair.rs b/uc-furnace/src/solver/conflict_repair.rs index 2aecae7..3fd80e4 100644 --- a/uc-furnace/src/solver/conflict_repair.rs +++ b/uc-furnace/src/solver/conflict_repair.rs @@ -9,19 +9,10 @@ use crate::domain::{ NUM_TIME_SLOTS, OFF_SHIFT_VALUE, TIME_STEP, }; -pub(crate) fn providers() -> Vec> { - vec![ - ConflictRepair::new("minimumRest", minimum_rest_repairs), - ConflictRepair::new("visibleShiftLimit", visible_shift_limit_repairs), - ConflictRepair::new("taskOperatorOnOwningShift", task_owning_shift_repairs), - ConflictRepair::new("shiftRoleCoverage", shift_role_coverage_repairs), - ConflictRepair::new("monitoringCapacity", monitoring_capacity_repairs), - ConflictRepair::new("furnaceOverlap", furnace_overlap_repairs), - ConflictRepair::new("changeoverGap", changeover_gap_repairs), - ] -} - -fn minimum_rest_repairs(plan: &Plan, limits: RepairLimits) -> Vec> { +pub(crate) fn minimum_rest_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); for previous_index in 0..plan.operator_shift_assignments.len() { @@ -37,15 +28,18 @@ fn minimum_rest_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec> { +pub(crate) fn visible_shift_limit_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut by_operator: HashMap> = HashMap::new(); for (index, assignment) in plan.operator_shift_assignments.iter().enumerate() { if assignment.roster_day >= 0 && assignment.is_working() { @@ -74,14 +68,17 @@ fn visible_shift_limit_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec> { +pub(crate) fn task_owning_shift_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); for (assignment_index, assignment) in plan.assignments.iter().enumerate() { @@ -109,7 +106,7 @@ fn task_owning_shift_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec Vec Vec> { +pub(crate) fn shift_role_coverage_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); for demand in &plan.shift_coverage_demands { @@ -183,7 +183,7 @@ fn shift_role_coverage_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec Vec> { +pub(crate) fn monitoring_capacity_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); let mut loads = monitoring_loads(plan); let mut repaired_shifts = HashSet::new(); @@ -231,7 +234,7 @@ fn monitoring_capacity_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec Vec> { +pub(crate) fn furnace_overlap_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); for left_index in 0..plan.assignments.len() { @@ -262,7 +268,7 @@ fn furnace_overlap_repairs(plan: &Plan, limits: RepairLimits) -> Vec Vec Vec Vec> { +pub(crate) fn changeover_gap_repairs( + plan: &Plan, + limits: RepairLimits, +) -> Vec> { let mut specs = Vec::new(); let mut matches_seen = 0usize; @@ -306,11 +315,11 @@ fn changeover_gap_repairs(plan: &Plan, limits: RepairLimits) -> Vec= limits.max_moves_per_step { return specs; } - push_first_assignment_value_repair(plan, &mut specs, left_index, "changeoverGap"); + push_first_assignment_value_repair(plan, &mut specs, left_index, "changeover_gap"); } } diff --git a/uc-furnace/src/solver/scalar_groups.rs b/uc-furnace/src/solver/scalar_groups.rs index 9453322..4967286 100644 --- a/uc-furnace/src/solver/scalar_groups.rs +++ b/uc-furnace/src/solver/scalar_groups.rs @@ -19,44 +19,6 @@ pub(crate) use schedule_task::furnace_schedule_task_assignment_candidates; #[cfg(test)] pub(crate) use schedule_task::schedule_task_values_for_assignment; -pub(crate) fn groups() -> Vec> { - let assignments = Plan::assignments(); - let roster_assignments = Plan::operator_shift_assignments(); - vec![ - ScalarGroup::candidates( - "furnace_assignment", - vec![assignments.scalar("assignment")], - furnace_assignment_candidates, - ), - ScalarGroup::candidates( - "roster_shift_assignment", - vec![roster_assignments.scalar("shift_type")], - roster_shift_assignment_candidates, - ), - ScalarGroup::candidates( - "task_operator_assignment", - vec![ - assignments.scalar("load_build_operator_id"), - assignments.scalar("program_operator_id"), - assignments.scalar("quench_operator_id"), - assignments.scalar("unload_operator_id"), - ], - task_operator_assignment_candidates, - ), - ScalarGroup::candidates( - "furnace_schedule_task_assignment", - vec![ - assignments.scalar("assignment"), - assignments.scalar("load_build_operator_id"), - assignments.scalar("program_operator_id"), - assignments.scalar("quench_operator_id"), - assignments.scalar("unload_operator_id"), - ], - furnace_schedule_task_assignment_candidates, - ), - ] -} - pub(crate) fn furnace_assignment_candidates( plan: &Plan, limits: ScalarGroupLimits, diff --git a/uc-furnace/src/solver/service/tests/config.rs b/uc-furnace/src/solver/service/tests/config.rs index bf1311e..5ea0d46 100644 --- a/uc-furnace/src/solver/service/tests/config.rs +++ b/uc-furnace/src/solver/service/tests/config.rs @@ -157,13 +157,13 @@ fn plan_solver_toml_matches_canonical_contract() { "phases[3].neighborhoods[0]" ), [ - "minimumRest", - "visibleShiftLimit", - "taskOperatorOnOwningShift", - "shiftRoleCoverage", - "monitoringCapacity", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "task_operator_on_owning_shift", + "shift_role_coverage", + "monitoring_capacity", + "furnace_overlap", + "changeover_gap", ] ); assert!(bool_field( @@ -188,10 +188,10 @@ fn plan_solver_toml_matches_canonical_contract() { "phases[3].neighborhoods[1].selectors[0]" ), [ - "minimumRest", - "visibleShiftLimit", - "furnaceOverlap", - "changeoverGap", + "minimum_rest", + "visible_shift_limit", + "furnace_overlap", + "changeover_gap", ] ); assert_eq!( diff --git a/uc-furnace/src/solver/service/tests/conflict_repair.rs b/uc-furnace/src/solver/service/tests/conflict_repair.rs index fdd2613..abbc45d 100644 --- a/uc-furnace/src/solver/service/tests/conflict_repair.rs +++ b/uc-furnace/src/solver/service/tests/conflict_repair.rs @@ -31,17 +31,13 @@ fn visible_shift_repair_keeps_hard_improving_partial_roster_moves() { mark_replacement_pool_rest_dirty(&mut plan, role, operator); let baseline_hard = hard_score(&plan); - let repairs = conflict_repair::providers() - .into_iter() - .find(|entry| entry.constraint_name() == "visibleShiftLimit") - .expect("visible shift repair provider") - .provider(); + let repairs = conflict_repair::visible_shift_limit_repairs; let candidates = repairs(&plan, limits()); assert!( candidates.iter().any(|candidate| { - candidate.reason() == "visibleShiftLimit" + candidate.reason() == "visible_shift_limit" && candidate_hard_score(&plan, candidate) > baseline_hard }), "visible shift repair should leave hard-improvement filtering to scoring" diff --git a/uc-furnace/src/solver/service/tests/scalar_groups.rs b/uc-furnace/src/solver/service/tests/scalar_groups.rs index 85c7698..1147050 100644 --- a/uc-furnace/src/solver/service/tests/scalar_groups.rs +++ b/uc-furnace/src/solver/service/tests/scalar_groups.rs @@ -74,8 +74,8 @@ fn furnace_provider_emits_hard_clean_construction_values() { for candidate in candidates { let mut candidate_plan = plan.clone(); apply_candidate(&mut candidate_plan, &candidate); - assert_eq!(hard_score(&candidate_plan, "furnaceOverlap"), 0); - assert_eq!(hard_score(&candidate_plan, "changeoverGap"), 0); + assert_eq!(hard_score(&candidate_plan, "furnace_overlap"), 0); + assert_eq!(hard_score(&candidate_plan, "changeover_gap"), 0); } } diff --git a/uc-furnace/static/app/analysis.js b/uc-furnace/static/app/analysis.js index 8879b77..95339fd 100644 --- a/uc-furnace/static/app/analysis.js +++ b/uc-furnace/static/app/analysis.js @@ -42,7 +42,7 @@ export function openConstraintAnalysis(ctx, constraint) { export function syncConstraintStatus(ctx) { if (!ctx.lastAnalysis || !ctx.lastAnalysis.analysis || !ctx.lastAnalysis.analysis.constraints) { - ctx.statusBar.updateConstraintDots(ctx.uiModel.constraints || []); + ctx.statusBar.updateConstraintDots(ctx.constraints); return; } ctx.statusBar.colorDotsFromAnalysis(normalizeConstraintSummaries(ctx.lastAnalysis.analysis.constraints)); diff --git a/uc-furnace/static/app/model.js b/uc-furnace/static/app/model.js new file mode 100644 index 0000000..005c62c --- /dev/null +++ b/uc-furnace/static/app/model.js @@ -0,0 +1,48 @@ +// Furnace's UI model on top of the CLI-generated `ui-model.json`. +// +// The CLI owns `static/generated/ui-model.json` and rewrites it on every model +// change: it lists constraint ids and the snake_case fact and entity +// collections. The tabs and the hard/soft split below belong to this app. + +// Tabs drawn by `render.js`, keyed by view id. +export var VIEWS = [ + { id: 'schedule', label: 'Schedule', kind: 'timeline', icon: 'fa-fire' }, + { id: 'crew', label: 'Crew', kind: 'table', icon: 'fa-users' }, + { id: 'orders', label: 'Orders', kind: 'table', icon: 'fa-industry' }, +]; + +// Soft constraint ids; every other constraint is hard. Mirrors +// `constraint_type` in `src/api/routes/analysis.rs`. +var SOFT_CONSTRAINTS = [ + 'express_lateness', + 'urgent_lateness', + 'standard_lateness', + 'thermal_changeover', + 'early_start_pressure', + 'night_start_preference', + 'overtime', + 'shift_load_balance', +]; + +// Status-bar entries for the CLI's constraint ids. +export function constraintEntries(uiModel) { + return (uiModel.constraints || []).map(function (name) { + return { name: name, type: SOFT_CONSTRAINTS.indexOf(name) >= 0 ? 'soft' : 'hard' }; + }); +} + +// Data-tab tables for the CLI's collections: `key` is the plan JSON field, +// `label` the plural heading. +export function collectionEntries(uiModel) { + return (uiModel.entities || []).concat(uiModel.facts || []).map(function (entry) { + var words = String(entry.plural).split('_'); + return { + key: words[0] + words.slice(1).map(capitalize).join(''), + label: words.map(capitalize).join(' '), + }; + }); +} + +function capitalize(word) { + return word.charAt(0).toUpperCase() + word.slice(1); +} diff --git a/uc-furnace/static/app/render.js b/uc-furnace/static/app/render.js index ea387fe..5101b62 100644 --- a/uc-furnace/static/app/render.js +++ b/uc-furnace/static/app/render.js @@ -1,4 +1,5 @@ import { syncConstraintStatus } from './analysis.js'; +import { collectionEntries, VIEWS } from './model.js'; import { buildSchedulePayload, destroyTimeline, ensureTimeline, averageAssignmentLoad } from './schedule.js'; import { assignmentMap, clonePlan, operatorShifts, valueAsString } from './utils.js'; @@ -65,7 +66,7 @@ export function renderOverview(ctx, data) { } export function renderViews(ctx, data) { - (ctx.uiModel.views || []).forEach(function (view) { + VIEWS.forEach(function (view) { var container = document.getElementById('view-' + view.id); if (!container) return; @@ -152,8 +153,8 @@ function renderOrdersView(container, data) { function renderTables(ctx, data) { ctx.tablesContainer.innerHTML = ''; - (ctx.uiModel.entities || []).concat(ctx.uiModel.facts || []).forEach(function (entry) { - var rows = data[entry.plural] || []; + collectionEntries(ctx.uiModel).forEach(function (entry) { + var rows = data[entry.key] || []; if (!rows.length) return; ctx.tablesContainer.appendChild(buildCollectionSection(entry.label, rows)); }); diff --git a/uc-furnace/static/app/runtime.js b/uc-furnace/static/app/runtime.js index 835d6e6..d4f8ad6 100644 --- a/uc-furnace/static/app/runtime.js +++ b/uc-furnace/static/app/runtime.js @@ -1,6 +1,7 @@ import { openAnalysis, openConstraintAnalysis, syncConstraintStatus } from './analysis.js'; import { buildApiGuideEndpoints } from './api.js'; import { cleanupTerminalJob, syncLifecycleMarkers } from './lifecycle.js'; +import { constraintEntries, VIEWS } from './model.js'; import { renderAll } from './render.js'; import { destroyAllTimelines } from './schedule.js'; import { clonePlan } from './utils.js'; @@ -21,9 +22,10 @@ export async function startApp() { backend: backend, config: config, uiModel: uiModel, + constraints: constraintEntries(uiModel), currentPlan: null, lastAnalysis: null, - activeTab: (uiModel.views && uiModel.views.length) ? uiModel.views[0].id : 'overview', + activeTab: VIEWS[0].id, viewPanels: {}, viewTimelines: {}, statusBar: null, @@ -37,14 +39,14 @@ export async function startApp() { }; var statusBar = SF.createStatusBar({ - constraints: uiModel.constraints || [], + constraints: ctx.constraints, onConstraintClick: function (index) { - openConstraintAnalysis(ctx, (ctx.uiModel.constraints || [])[index]); + openConstraintAnalysis(ctx, ctx.constraints[index]); }, }); ctx.statusBar = statusBar; - var tabs = (uiModel.views || []).map(function (view, index) { + var tabs = VIEWS.map(function (view, index) { return { id: view.id, label: view.label, @@ -52,9 +54,6 @@ export async function startApp() { active: index === 0, }; }); - if (!tabs.length) { - tabs.push({ id: 'overview', label: 'Overview', icon: 'fa-compass', active: true }); - } tabs.push({ id: 'data', label: 'Data', icon: 'fa-table' }); tabs.push({ id: 'api', label: 'REST API', icon: 'fa-book' }); @@ -89,7 +88,7 @@ export async function startApp() { ctx.overviewPanel.appendChild(ctx.overviewContainer); app.appendChild(ctx.overviewPanel); - (uiModel.views || []).forEach(function (view) { + VIEWS.forEach(function (view) { var panel = SF.el('div', { className: 'sf-content', style: { display: ctx.activeTab === view.id ? '' : 'none' } }); panel.appendChild(SF.el('div', { id: 'view-' + view.id })); ctx.viewPanels[view.id] = panel; diff --git a/uc-furnace/static/generated/ui-model.json b/uc-furnace/static/generated/ui-model.json index be0ba9a..f7dafa8 100644 --- a/uc-furnace/static/generated/ui-model.json +++ b/uc-furnace/static/generated/ui-model.json @@ -1,50 +1,300 @@ { + "conflictRepairs": [ + { + "constraint": "minimum_rest", + "provider": "crate::solver::conflict_repair::minimum_rest_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "visible_shift_limit", + "provider": "crate::solver::conflict_repair::visible_shift_limit_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "task_operator_on_owning_shift", + "provider": "crate::solver::conflict_repair::task_owning_shift_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "shift_role_coverage", + "provider": "crate::solver::conflict_repair::shift_role_coverage_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "monitoring_capacity", + "provider": "crate::solver::conflict_repair::monitoring_capacity_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "furnace_overlap", + "provider": "crate::solver::conflict_repair::furnace_overlap_repairs", + "selector": "compound", + "solverConfig": false + }, + { + "constraint": "changeover_gap", + "provider": "crate::solver::conflict_repair::changeover_gap_repairs", + "selector": "compound", + "solverConfig": false + } + ], + "constraints": [ + "assigned_tasks_require_scheduled_furnace", + "changeover_gap", + "consecutive_nights", + "day_only_night", + "early_start_pressure", + "excessive_load", + "excessive_temperature", + "express_lateness", + "furnace_overlap", + "incompatible_process", + "load_build_shift_ownership", + "minimum_rest", + "monitoring_capacity", + "night_start_preference", + "operator_double_booked", + "outside_week", + "overtime", + "program_shift_ownership", + "quench_shift_ownership", + "required_task_assigned", + "shift_load_balance", + "shift_role_coverage", + "standard_lateness", + "task_operator_on_owning_shift", + "task_operator_skilled", + "thermal_changeover", + "unassigned_orders", + "unload_shift_ownership", + "urgent_lateness", + "visible_shift_limit" + ], "entities": [ - { "id": "assignments", "label": "Assignments", "plural": "assignments" }, - { "id": "operatorShiftAssignments", "label": "Operator Shift Assignments", "plural": "operatorShiftAssignments" } + { + "label": "Furnace Assignment", + "name": "furnace_assignment", + "plural": "assignments" + }, + { + "label": "Operator Shift Assignment", + "name": "operator_shift_assignment", + "plural": "operator_shift_assignments" + } ], "facts": [ - { "id": "furnaces", "label": "Furnaces", "plural": "furnaces" }, - { "id": "workOrders", "label": "Work Orders", "plural": "workOrders" }, - { "id": "operators", "label": "Operators", "plural": "operators" }, - { "id": "shifts", "label": "Shifts", "plural": "shifts" }, - { "id": "shiftCoverageDemands", "label": "Shift Coverage Demands", "plural": "shiftCoverageDemands" } + { + "label": "Furnace", + "name": "furnace", + "plural": "furnaces" + }, + { + "label": "Work Order", + "name": "work_order", + "plural": "work_orders" + }, + { + "label": "Operator", + "name": "operator", + "plural": "operators" + }, + { + "label": "Shift", + "name": "shift", + "plural": "shifts" + }, + { + "label": "Shift Coverage Demand", + "name": "shift_coverage_demand", + "plural": "shift_coverage_demands" + } ], - "constraints": [ - { "name": "unassignedOrders", "type": "hard" }, - { "name": "incompatibleProcess", "type": "hard" }, - { "name": "excessiveTemperature", "type": "hard" }, - { "name": "excessiveLoad", "type": "hard" }, - { "name": "outsideWeek", "type": "hard" }, - { "name": "furnaceOverlap", "type": "hard" }, - { "name": "changeoverGap", "type": "hard" }, - { "name": "loadBuildShiftOwnership", "type": "hard" }, - { "name": "programShiftOwnership", "type": "hard" }, - { "name": "quenchShiftOwnership", "type": "hard" }, - { "name": "unloadShiftOwnership", "type": "hard" }, - { "name": "assignedTasksRequireScheduledFurnace", "type": "hard" }, - { "name": "requiredTaskAssigned", "type": "hard" }, - { "name": "taskOperatorSkilled", "type": "hard" }, - { "name": "taskOperatorOnOwningShift", "type": "hard" }, - { "name": "operatorDoubleBooked", "type": "hard" }, - { "name": "shiftRoleCoverage", "type": "hard" }, - { "name": "monitoringCapacity", "type": "hard" }, - { "name": "dayOnlyNight", "type": "hard" }, - { "name": "minimumRest", "type": "hard" }, - { "name": "visibleShiftLimit", "type": "hard" }, - { "name": "consecutiveNights", "type": "hard" }, - { "name": "expressLateness", "type": "soft" }, - { "name": "urgentLateness", "type": "soft" }, - { "name": "standardLateness", "type": "soft" }, - { "name": "thermalChangeover", "type": "soft" }, - { "name": "earlyStartPressure", "type": "soft" }, - { "name": "nightStartPreference", "type": "soft" }, - { "name": "overtime", "type": "soft" }, - { "name": "shiftLoadBalance", "type": "soft" } + "scalarGroups": [ + { + "kind": "candidates", + "name": "furnace_assignment", + "solverConfig": false, + "targets": [ + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "assignment" + } + ] + }, + { + "kind": "candidates", + "name": "roster_shift_assignment", + "solverConfig": false, + "targets": [ + { + "entity": "operator_shift_assignment", + "entity_plural": "operator_shift_assignments", + "field": "shift_type" + } + ] + }, + { + "kind": "candidates", + "name": "task_operator_assignment", + "solverConfig": false, + "targets": [ + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "load_build_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "program_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "quench_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "unload_operator_id" + } + ] + }, + { + "kind": "candidates", + "name": "furnace_schedule_task_assignment", + "solverConfig": false, + "targets": [ + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "assignment" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "load_build_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "program_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "quench_operator_id" + }, + { + "entity": "furnace_assignment", + "entity_plural": "assignments", + "field": "unload_operator_id" + } + ] + } ], "views": [ - { "id": "schedule", "label": "Schedule", "kind": "timeline", "icon": "fa-fire" }, - { "id": "crew", "label": "Crew", "kind": "table", "icon": "fa-users" }, - { "id": "orders", "label": "Orders", "kind": "table", "icon": "fa-industry" } + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "furnace_assignment", + "entityPlural": "assignments", + "id": "furnace_assignment-assignment", + "kind": "scalar", + "label": "Furnace Assignment · assignment", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "furnace_assignment_construction_entity_order_key", + "constructionValueOrderKey": "furnace_assignment_construction_value_order_key" + }, + "sourcePlural": "compatible_assignments", + "variableField": "assignment" + }, + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "furnace_assignment", + "entityPlural": "assignments", + "id": "furnace_assignment-load_build_operator_id", + "kind": "scalar", + "label": "Furnace Assignment · load_build_operator_id", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "task_operator_construction_entity_order_key", + "constructionValueOrderKey": "load_build_operator_construction_value_order_key" + }, + "sourcePlural": "eligible_load_build_operator_ids", + "variableField": "load_build_operator_id" + }, + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "furnace_assignment", + "entityPlural": "assignments", + "id": "furnace_assignment-program_operator_id", + "kind": "scalar", + "label": "Furnace Assignment · program_operator_id", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "task_operator_construction_entity_order_key", + "constructionValueOrderKey": "program_operator_construction_value_order_key" + }, + "sourcePlural": "eligible_program_operator_ids", + "variableField": "program_operator_id" + }, + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "furnace_assignment", + "entityPlural": "assignments", + "id": "furnace_assignment-quench_operator_id", + "kind": "scalar", + "label": "Furnace Assignment · quench_operator_id", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "task_operator_construction_entity_order_key", + "constructionValueOrderKey": "quench_operator_construction_value_order_key" + }, + "sourcePlural": "eligible_quench_operator_ids", + "variableField": "quench_operator_id" + }, + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "furnace_assignment", + "entityPlural": "assignments", + "id": "furnace_assignment-unload_operator_id", + "kind": "scalar", + "label": "Furnace Assignment · unload_operator_id", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "task_operator_construction_entity_order_key", + "constructionValueOrderKey": "unload_operator_construction_value_order_key" + }, + "sourcePlural": "eligible_unload_operator_ids", + "variableField": "unload_operator_id" + }, + { + "allowsUnassigned": true, + "countableRange": null, + "entity": "operator_shift_assignment", + "entityPlural": "operator_shift_assignments", + "id": "operator_shift_assignment-shift_type", + "kind": "scalar", + "label": "Operator Shift Assignment · shift_type", + "listMetadata": {}, + "scalarHooks": { + "constructionEntityOrderKey": "operator_shift_construction_entity_order_key", + "constructionValueOrderKey": "operator_shift_construction_value_order_key" + }, + "sourcePlural": "allowed_shift_types", + "variableField": "shift_type" + } ] -} +} \ No newline at end of file diff --git a/uc-furnace/static/sf-config.json b/uc-furnace/static/sf-config.json index e65e285..f25071d 100644 --- a/uc-furnace/static/sf-config.json +++ b/uc-furnace/static/sf-config.json @@ -1,5 +1,8 @@ { "title": "SolverForge Furnace", "subtitle": "Industrial Heat-Treatment Planning", + "constraints": [], + "entities": [], + "facts": [], "defaultDemoId": "STANDARD" -} +} \ No newline at end of file diff --git a/uc-furnace/tests/project_shape.rs b/uc-furnace/tests/project_shape.rs index a35586d..16f22db 100644 --- a/uc-furnace/tests/project_shape.rs +++ b/uc-furnace/tests/project_shape.rs @@ -103,8 +103,9 @@ fn public_demo_path_has_no_seed_or_repair_backdoors() { fs::read_to_string(project_path("src/data/data_seed/problem.rs")).expect("problem exists"); let furnace_seed = fs::read_to_string(project_path("src/data/data_seed/furnace_seed.rs")) .expect("furnace_seed exists"); - let staffing_hard = - fs::read_to_string(project_path("src/constraints/staffing_hard.rs")).expect("staffing"); + let operator_double_booked = + fs::read_to_string(project_path("src/constraints/operator_double_booked.rs")) + .expect("operator_double_booked constraint"); let plan_rs = fs::read_to_string(project_path("src/domain/plan.rs")).expect("plan"); let lifecycle = fs::read_to_string(project_path("static/app/lifecycle.js")).expect("lifecycle exists"); @@ -117,7 +118,7 @@ fn public_demo_path_has_no_seed_or_repair_backdoors() { assert!(!furnace_seed.contains("repair_")); assert!(!furnace_seed.contains("seed_initial_assignments")); assert!(!project_path("src/data/data_seed/workforce_seed.rs").exists()); - assert!(staffing_hard.contains("ManualTaskBookingEntries")); + assert!(operator_double_booked.contains("ManualTaskBookingEntries")); assert!(!plan_rs.contains("self.shifts.iter().find")); assert!(lifecycle.contains("cleanupTerminalJob")); assert!(schedule.contains("buildUnassignedSection(unassignedOrders)")); diff --git a/uc-hospital/Cargo.lock b/uc-hospital/Cargo.lock index 88a5e6c..5c3f820 100644 --- a/uc-hospital/Cargo.lock +++ b/uc-hospital/Cargo.lock @@ -877,9 +877,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -903,9 +903,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -915,9 +915,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -925,9 +925,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -963,18 +963,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-hospital/Cargo.toml b/uc-hospital/Cargo.toml index c8c4e43..cae3170 100644 --- a/uc-hospital/Cargo.toml +++ b/uc-hospital/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" publish = false [dependencies] -solverforge = { version = "0.25.0", features = [ +solverforge = { version = "0.25.1", features = [ "serde", "console", "verbose-logging", diff --git a/uc-hospital/README.md b/uc-hospital/README.md index 1d72558..d2502a2 100644 --- a/uc-hospital/README.md +++ b/uc-hospital/README.md @@ -56,7 +56,7 @@ make help - Package: `solverforge-hospital`; version is declared in `Cargo.toml` - Release binary: `solverforge-hospital` - Rust: `1.95` -- SolverForge runtime: `solverforge` `0.25.0` +- SolverForge runtime: `solverforge` `0.25.1` - Browser UI assets: `solverforge-ui` `0.9.0` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` diff --git a/uc-hospital/WIREFRAME.md b/uc-hospital/WIREFRAME.md index 6575ac6..c25555a 100644 --- a/uc-hospital/WIREFRAME.md +++ b/uc-hospital/WIREFRAME.md @@ -128,7 +128,7 @@ UI helper. ├── solver.toml │ Embedded solver policy. This is the runtime source of truth for search. ├── solverforge.app.toml -│ App metadata, model surface, and the `solverforge 0.25.0` runtime target. +│ App metadata, model surface, and the `solverforge 0.25.1` runtime target. ├── Dockerfile │ Container build for running the app outside the dev checkout. ├── Makefile diff --git a/uc-hospital/solverforge.app.toml b/uc-hospital/solverforge.app.toml index fb7f0b9..96f4191 100644 --- a/uc-hospital/solverforge.app.toml +++ b/uc-hospital/solverforge.app.toml @@ -8,8 +8,8 @@ shell = "web" cli_version = "2.2.2" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-hospital/src/constraints/assemble.rs b/uc-hospital/src/constraints/assemble.rs new file mode 100644 index 0000000..78abf72 --- /dev/null +++ b/uc-hospital/src/constraints/assemble.rs @@ -0,0 +1,21 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +/// Collects the full scoring model used by `Plan`. +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::assigned_shift::constraint(), + super::required_skill::constraint(), + super::overlapping_shift::constraint(), + super::minimum_rest::constraint(), + super::one_shift_per_day::constraint(), + super::unavailable_employee::constraint(), + super::undesired_day::constraint(), + super::desired_day::constraint(), + super::balance_assignments::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-hospital/src/constraints/mod.rs b/uc-hospital/src/constraints/mod.rs index 64d6777..3471eb5 100644 --- a/uc-hospital/src/constraints/mod.rs +++ b/uc-hospital/src/constraints/mod.rs @@ -1,14 +1,8 @@ -#![cfg_attr(rustfmt, rustfmt_skip)] //! Constraint assembly for employee scheduling. //! //! Each sibling module contributes one named rule. `create_constraints()` //! simply lists them in the order we want them to appear in analysis output. -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules mod assigned_shift; mod balance_assignments; @@ -21,23 +15,6 @@ mod unavailable_employee; mod undesired_day; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; - /// Collects the full scoring model used by `Plan`. - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - assigned_shift::constraint(), - required_skill::constraint(), - overlapping_shift::constraint(), - minimum_rest::constraint(), - one_shift_per_day::constraint(), - unavailable_employee::constraint(), - undesired_day::constraint(), - desired_day::constraint(), - balance_assignments::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints; diff --git a/uc-lessons/Cargo.lock b/uc-lessons/Cargo.lock index 872b173..a938c73 100644 --- a/uc-lessons/Cargo.lock +++ b/uc-lessons/Cargo.lock @@ -877,9 +877,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -892,9 +892,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -903,9 +903,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -915,9 +915,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -925,9 +925,9 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] @@ -952,9 +952,9 @@ dependencies = [ [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -963,18 +963,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-lessons/Cargo.toml b/uc-lessons/Cargo.toml index 76aa902..2b48fdf 100644 --- a/uc-lessons/Cargo.toml +++ b/uc-lessons/Cargo.toml @@ -11,7 +11,7 @@ name = "solverforge-lessons" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = ["serde", "console", "verbose-logging"] } +solverforge = { version = "0.25.1", features = ["serde", "console", "verbose-logging"] } solverforge-ui = { version = "0.9.0" } # Web server axum = "0.8.9" diff --git a/uc-lessons/README.md b/uc-lessons/README.md index d81feae..be367ea 100644 --- a/uc-lessons/README.md +++ b/uc-lessons/README.md @@ -59,7 +59,7 @@ make help - Package: `solverforge-lessons`; version is declared in `Cargo.toml` - Release binary: `solverforge-lessons` - Rust: `1.95` -- SolverForge runtime: `solverforge` `0.25.0` +- SolverForge runtime: `solverforge` `0.25.1` - Browser UI assets: `solverforge-ui` `0.9.0` - Scaffold metadata: `solverforge-cli` `2.2.2` in `solverforge.app.toml` diff --git a/uc-lessons/WIREFRAME.md b/uc-lessons/WIREFRAME.md index f75a382..928b2a9 100644 --- a/uc-lessons/WIREFRAME.md +++ b/uc-lessons/WIREFRAME.md @@ -87,7 +87,7 @@ It shows how to combine: │ Embedded search policy for construction and local search. ├── solverforge.app.toml │ App metadata, demo IDs, model facts/entities, registry dependency sources, -│ and the `solverforge 0.25.0` runtime target. +│ and the `solverforge 0.25.1` runtime target. ├── Makefile │ Local build, validation, inline browser smoke, and Space/Docker commands. ├── Dockerfile diff --git a/uc-lessons/solverforge.app.toml b/uc-lessons/solverforge.app.toml index c7693e8..0f4ff99 100644 --- a/uc-lessons/solverforge.app.toml +++ b/uc-lessons/solverforge.app.toml @@ -5,8 +5,8 @@ cli_version = "2.2.2" shell = "web" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-lessons/src/constraints/assemble.rs b/uc-lessons/src/constraints/assemble.rs new file mode 100644 index 0000000..ddd0c02 --- /dev/null +++ b/uc-lessons/src/constraints/assemble.rs @@ -0,0 +1,23 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +/// Collects the full scoring model used by `Plan`. +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::assign_timeslot::constraint(), + super::assign_room::constraint(), + super::teacher_availability::constraint(), + super::group_availability::constraint(), + super::room_kind::constraint(), + super::room_capacity::constraint(), + super::no_group_conflict::constraint(), + super::no_teacher_conflict::constraint(), + super::no_room_conflict::constraint(), + super::late_lesson::constraint(), + super::repeated_subject_day::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-lessons/src/constraints/mod.rs b/uc-lessons/src/constraints/mod.rs index 063f820..1ab0006 100644 --- a/uc-lessons/src/constraints/mod.rs +++ b/uc-lessons/src/constraints/mod.rs @@ -1,48 +1,23 @@ -#![cfg_attr(rustfmt, rustfmt_skip)] //! Constraint assembly for lesson timetabling. //! //! Each child module owns one named timetable rule. `create_constraints()` //! lists them in the order beginners should read the score analysis: assignment //! completeness first, hard feasibility next, soft timetable quality last. -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules -mod assign_timeslot; mod assign_room; -mod teacher_availability; +mod assign_timeslot; mod group_availability; -mod room_kind; -mod room_capacity; +mod late_lesson; mod no_group_conflict; -mod no_teacher_conflict; mod no_room_conflict; -mod late_lesson; +mod no_teacher_conflict; mod repeated_subject_day; +mod room_capacity; +mod room_kind; +mod teacher_availability; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; - /// Collects the full scoring model used by `Plan`. - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - assign_timeslot::constraint(), - assign_room::constraint(), - teacher_availability::constraint(), - group_availability::constraint(), - room_kind::constraint(), - room_capacity::constraint(), - no_group_conflict::constraint(), - no_teacher_conflict::constraint(), - no_room_conflict::constraint(), - late_lesson::constraint(), - repeated_subject_day::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints; diff --git a/uc-lessons/src/constraints/room_capacity.rs b/uc-lessons/src/constraints/room_capacity.rs index a4af131..8b533e2 100644 --- a/uc-lessons/src/constraints/room_capacity.rs +++ b/uc-lessons/src/constraints/room_capacity.rs @@ -62,10 +62,7 @@ mod tests { #[test] fn ignores_sufficient_or_unassigned_room_capacity() { - assert_eq!( - score_for_room_capacity(30, true), - HardMediumSoftScore::ZERO - ); + assert_eq!(score_for_room_capacity(30, true), HardMediumSoftScore::ZERO); assert_eq!( score_for_room_capacity(24, false), HardMediumSoftScore::ZERO diff --git a/uc-orders/Cargo.lock b/uc-orders/Cargo.lock index 18b8e3e..cadaf54 100644 --- a/uc-orders/Cargo.lock +++ b/uc-orders/Cargo.lock @@ -790,9 +790,9 @@ dependencies = [ [[package]] name = "solverforge" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3ecc7e869c19a21e06386736824f230ad106941188b861424389556456737c" +checksum = "c899657c17ae3a41d67b583ec400e5d79fe253f0ed62a38a2efcb5d04d1171bb" dependencies = [ "solverforge-config", "solverforge-console", @@ -805,9 +805,9 @@ dependencies = [ [[package]] name = "solverforge-config" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e853dfbcde07a06152b6163c27748e9ef9364ca8615892309e85a370c6ea4284" +checksum = "9884c7ed72153f7f21f185af3072552b70e6fa65ba4ecbf88a665ee159fc126c" dependencies = [ "serde", "thiserror", @@ -816,9 +816,9 @@ dependencies = [ [[package]] name = "solverforge-console" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "607541fe43adced2f98225048c44c892596bb95b5e29dd4ecb98ff6927b71f99" +checksum = "8f6e986665547c62bc4041bb13abadee6f418d917d90b159c9e6301f82e81565" dependencies = [ "num-format", "owo-colors", @@ -828,9 +828,9 @@ dependencies = [ [[package]] name = "solverforge-core" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d344d389ecd75cc21902aebc3b21a3a60a79bd9a744cb3785b3a34dc27814fc" +checksum = "978f9b73065e7132ebf82677c2fd10ee3436952b6ffeb4664519010a70cc0044" dependencies = [ "serde", "thiserror", @@ -838,18 +838,18 @@ dependencies = [ [[package]] name = "solverforge-cvrp" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc55ed3bfca9e760b9eddb5c96ed772a9b417f4cb1267705a14af4598de1424" +checksum = "90f6596f3f17c2daa7bc0f317c2a325498ee5c8eacf548982f7ccd78487f90d8" dependencies = [ "solverforge-solver", ] [[package]] name = "solverforge-macros" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa60832bec77292e211ac91218373014b62d1468db87f997ca4a4d084b4a004e" +checksum = "93ae5e2b12768d6eeb3ef8b0b86f5017ce92f4b088eddf8df6b2cba5d131bfc2" dependencies = [ "proc-macro2", "quote", @@ -876,18 +876,18 @@ dependencies = [ [[package]] name = "solverforge-scoring" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1e1af1ed9f6893275be1411623d5c569c46cccc1f48a17d0acefc9f21b0c15" +checksum = "1cbf6db5212fb19dc0dafcf4edcc1cd023897ac5d72964bb16e8c0e5cdf2597b" dependencies = [ "solverforge-core", ] [[package]] name = "solverforge-solver" -version = "0.25.0" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0f253298de2e5cbd311c01545d8652577200b2142e8d0dce4ff76f5f8a03e54" +checksum = "7a4ec0fcb1febd3bc0adcfc0567decacefda8767925bafabf5e848ebc30f6bb4" dependencies = [ "rand", "rayon", diff --git a/uc-orders/Cargo.toml b/uc-orders/Cargo.toml index 21a6f39..2ba984e 100644 --- a/uc-orders/Cargo.toml +++ b/uc-orders/Cargo.toml @@ -12,7 +12,7 @@ name = "solverforge-orders" path = "src/main.rs" [dependencies] -solverforge = { version = "0.25.0", features = ["serde", "console", "verbose-logging"] } +solverforge = { version = "0.25.1", features = ["serde", "console", "verbose-logging"] } solverforge-ui = { version = "0.9.0" } # Web server axum = "0.8.9" diff --git a/uc-orders/README.md b/uc-orders/README.md index 46577bc..e56da01 100644 --- a/uc-orders/README.md +++ b/uc-orders/README.md @@ -33,7 +33,7 @@ header retains pause, resume, stop, telemetry, and exact snapshot analysis. ![SolverForge Orders solved overview](docs/screenshot.png) Package and binary: `solverforge-orders` 0.1.0. The app requires Rust 1.95 and -uses `solverforge` 0.25.0 plus `solverforge-ui` 0.9.0 under Apache-2.0. +uses `solverforge` 0.25.1 plus `solverforge-ui` 0.9.0 under Apache-2.0. ## Planning Model diff --git a/uc-orders/solverforge.app.toml b/uc-orders/solverforge.app.toml index 9be7184..6f14e38 100644 --- a/uc-orders/solverforge.app.toml +++ b/uc-orders/solverforge.app.toml @@ -8,8 +8,8 @@ shell = "web" cli_version = "3.1.0" [runtime] -target = "solverforge 0.25.0" -runtime_source = "crates.io: solverforge 0.25.0" +target = "solverforge 0.25.1" +runtime_source = "crates.io: solverforge 0.25.1" ui_source = "crates.io: solverforge-ui 0.9.0" [demo] diff --git a/uc-orders/src/constraints/assemble.rs b/uc-orders/src/constraints/assemble.rs new file mode 100644 index 0000000..38f9de3 --- /dev/null +++ b/uc-orders/src/constraints/assemble.rs @@ -0,0 +1,14 @@ +//! Assembles the constraint set the solver scores every plan against. + +use crate::domain::Plan; +use solverforge::prelude::*; + +pub fn create_constraints() -> impl ConstraintSet { + // @solverforge:begin constraint-calls + ( + super::order_incidence::constraint(), + super::required_buckets::constraint(), + super::route_distance::constraint(), + ) + // @solverforge:end constraint-calls +} diff --git a/uc-orders/src/constraints/mod.rs b/uc-orders/src/constraints/mod.rs index 61c20a1..1552cca 100644 --- a/uc-orders/src/constraints/mod.rs +++ b/uc-orders/src/constraints/mod.rs @@ -1,26 +1,11 @@ //! Constraint assembly for bucket feasibility, order incidence, and route distance. -use crate::domain::Plan; -use solverforge::prelude::*; - -pub use self::assemble::create_constraints; - // @solverforge:begin constraint-modules mod order_incidence; mod required_buckets; mod route_distance; // @solverforge:end constraint-modules -mod assemble { - use super::*; +mod assemble; - pub fn create_constraints() -> impl ConstraintSet { - // @solverforge:begin constraint-calls - ( - order_incidence::constraint(), - required_buckets::constraint(), - route_distance::constraint(), - ) - // @solverforge:end constraint-calls - } -} +pub use assemble::create_constraints;