dabke 0.83.0 → 0.84.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +21 -0
- package/README.md +22 -27
- package/dist/client.d.ts +39 -3
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js.map +1 -1
- package/dist/client.schemas.d.ts +118 -18
- package/dist/client.schemas.d.ts.map +1 -1
- package/dist/client.schemas.js +110 -6
- package/dist/client.schemas.js.map +1 -1
- package/dist/client.types.d.ts +63 -7
- package/dist/client.types.d.ts.map +1 -1
- package/dist/client.types.js.map +1 -1
- package/dist/cpsat/cost.d.ts +5 -2
- package/dist/cpsat/cost.d.ts.map +1 -1
- package/dist/cpsat/cost.js +13 -6
- package/dist/cpsat/cost.js.map +1 -1
- package/dist/cpsat/model-builder.d.ts +42 -61
- package/dist/cpsat/model-builder.d.ts.map +1 -1
- package/dist/cpsat/model-builder.js +451 -56
- package/dist/cpsat/model-builder.js.map +1 -1
- package/dist/cpsat/response.d.ts +19 -7
- package/dist/cpsat/response.d.ts.map +1 -1
- package/dist/cpsat/response.js +48 -9
- package/dist/cpsat/response.js.map +1 -1
- package/dist/cpsat/rule-descriptor.d.ts +250 -0
- package/dist/cpsat/rule-descriptor.d.ts.map +1 -0
- package/dist/cpsat/rule-descriptor.js +51 -0
- package/dist/cpsat/rule-descriptor.js.map +1 -0
- package/dist/cpsat/rules/artifacts.d.ts +9 -0
- package/dist/cpsat/rules/artifacts.d.ts.map +1 -0
- package/dist/cpsat/rules/artifacts.js +31 -0
- package/dist/cpsat/rules/artifacts.js.map +1 -0
- package/dist/cpsat/rules/assign-together.d.ts +18 -20
- package/dist/cpsat/rules/assign-together.d.ts.map +1 -1
- package/dist/cpsat/rules/assign-together.js +90 -54
- package/dist/cpsat/rules/assign-together.js.map +1 -1
- package/dist/cpsat/rules/assigned-day.d.ts +12 -0
- package/dist/cpsat/rules/assigned-day.d.ts.map +1 -0
- package/dist/cpsat/rules/assigned-day.js +43 -0
- package/dist/cpsat/rules/assigned-day.js.map +1 -0
- package/dist/cpsat/rules/assignment-priority.d.ts +15 -29
- package/dist/cpsat/rules/assignment-priority.d.ts.map +1 -1
- package/dist/cpsat/rules/assignment-priority.js +47 -50
- package/dist/cpsat/rules/assignment-priority.js.map +1 -1
- package/dist/cpsat/rules/assignment-terms.d.ts +6 -0
- package/dist/cpsat/rules/assignment-terms.d.ts.map +1 -0
- package/dist/cpsat/rules/assignment-terms.js +19 -0
- package/dist/cpsat/rules/assignment-terms.js.map +1 -0
- package/dist/cpsat/rules/concurrent-intervals.d.ts +19 -0
- package/dist/cpsat/rules/concurrent-intervals.d.ts.map +1 -0
- package/dist/cpsat/rules/concurrent-intervals.js +57 -0
- package/dist/cpsat/rules/concurrent-intervals.js.map +1 -0
- package/dist/cpsat/rules/cost-utils.d.ts +1 -3
- package/dist/cpsat/rules/cost-utils.d.ts.map +1 -1
- package/dist/cpsat/rules/cost-utils.js +0 -7
- package/dist/cpsat/rules/cost-utils.js.map +1 -1
- package/dist/cpsat/rules/day-cost-multiplier.d.ts +10 -10
- package/dist/cpsat/rules/day-cost-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/day-cost-multiplier.js +88 -77
- package/dist/cpsat/rules/day-cost-multiplier.js.map +1 -1
- package/dist/cpsat/rules/day-cost-surcharge.d.ts +10 -10
- package/dist/cpsat/rules/day-cost-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/day-cost-surcharge.js +76 -65
- package/dist/cpsat/rules/day-cost-surcharge.js.map +1 -1
- package/dist/cpsat/rules/index.d.ts +30 -24
- package/dist/cpsat/rules/index.d.ts.map +1 -1
- package/dist/cpsat/rules/index.js +30 -24
- package/dist/cpsat/rules/index.js.map +1 -1
- package/dist/cpsat/rules/location-preference.d.ts +14 -21
- package/dist/cpsat/rules/location-preference.d.ts.map +1 -1
- package/dist/cpsat/rules/location-preference.js +45 -45
- package/dist/cpsat/rules/location-preference.js.map +1 -1
- package/dist/cpsat/rules/max-concurrent-assignments.d.ts +46 -0
- package/dist/cpsat/rules/max-concurrent-assignments.d.ts.map +1 -0
- package/dist/cpsat/rules/max-concurrent-assignments.js +121 -0
- package/dist/cpsat/rules/max-concurrent-assignments.js.map +1 -0
- package/dist/cpsat/rules/max-consecutive-days.d.ts +18 -17
- package/dist/cpsat/rules/max-consecutive-days.d.ts.map +1 -1
- package/dist/cpsat/rules/max-consecutive-days.js +67 -66
- package/dist/cpsat/rules/max-consecutive-days.js.map +1 -1
- package/dist/cpsat/rules/max-days-of-week-per-period.d.ts +45 -0
- package/dist/cpsat/rules/max-days-of-week-per-period.d.ts.map +1 -0
- package/dist/cpsat/rules/max-days-of-week-per-period.js +95 -0
- package/dist/cpsat/rules/max-days-of-week-per-period.js.map +1 -0
- package/dist/cpsat/rules/max-days-week.d.ts +17 -31
- package/dist/cpsat/rules/max-days-week.d.ts.map +1 -1
- package/dist/cpsat/rules/max-days-week.js +69 -81
- package/dist/cpsat/rules/max-days-week.js.map +1 -1
- package/dist/cpsat/rules/max-hours-day.d.ts +14 -31
- package/dist/cpsat/rules/max-hours-day.d.ts.map +1 -1
- package/dist/cpsat/rules/max-hours-day.js +56 -72
- package/dist/cpsat/rules/max-hours-day.js.map +1 -1
- package/dist/cpsat/rules/max-hours-week.d.ts +15 -31
- package/dist/cpsat/rules/max-hours-week.d.ts.map +1 -1
- package/dist/cpsat/rules/max-hours-week.js +60 -75
- package/dist/cpsat/rules/max-hours-week.js.map +1 -1
- package/dist/cpsat/rules/max-shifts-day.d.ts +17 -33
- package/dist/cpsat/rules/max-shifts-day.d.ts.map +1 -1
- package/dist/cpsat/rules/max-shifts-day.js +57 -73
- package/dist/cpsat/rules/max-shifts-day.js.map +1 -1
- package/dist/cpsat/rules/min-consecutive-days.d.ts +18 -18
- package/dist/cpsat/rules/min-consecutive-days.d.ts.map +1 -1
- package/dist/cpsat/rules/min-consecutive-days.js +123 -94
- package/dist/cpsat/rules/min-consecutive-days.js.map +1 -1
- package/dist/cpsat/rules/min-days-of-week-per-period.d.ts +35 -0
- package/dist/cpsat/rules/min-days-of-week-per-period.d.ts.map +1 -0
- package/dist/cpsat/rules/min-days-of-week-per-period.js +108 -0
- package/dist/cpsat/rules/min-days-of-week-per-period.js.map +1 -0
- package/dist/cpsat/rules/min-days-week.d.ts +13 -26
- package/dist/cpsat/rules/min-days-week.d.ts.map +1 -1
- package/dist/cpsat/rules/min-days-week.js +85 -74
- package/dist/cpsat/rules/min-days-week.js.map +1 -1
- package/dist/cpsat/rules/min-hours-day.d.ts +14 -17
- package/dist/cpsat/rules/min-hours-day.d.ts.map +1 -1
- package/dist/cpsat/rules/min-hours-day.js +72 -54
- package/dist/cpsat/rules/min-hours-day.js.map +1 -1
- package/dist/cpsat/rules/min-hours-week.d.ts +15 -18
- package/dist/cpsat/rules/min-hours-week.d.ts.map +1 -1
- package/dist/cpsat/rules/min-hours-week.js +75 -57
- package/dist/cpsat/rules/min-hours-week.js.map +1 -1
- package/dist/cpsat/rules/min-rest-between-shifts.d.ts +14 -17
- package/dist/cpsat/rules/min-rest-between-shifts.d.ts.map +1 -1
- package/dist/cpsat/rules/min-rest-between-shifts.js +148 -138
- package/dist/cpsat/rules/min-rest-between-shifts.js.map +1 -1
- package/dist/cpsat/rules/minimize-cost.d.ts +2 -18
- package/dist/cpsat/rules/minimize-cost.d.ts.map +1 -1
- package/dist/cpsat/rules/minimize-cost.js +151 -163
- package/dist/cpsat/rules/minimize-cost.js.map +1 -1
- package/dist/cpsat/rules/must-assign.d.ts +5 -42
- package/dist/cpsat/rules/must-assign.d.ts.map +1 -1
- package/dist/cpsat/rules/must-assign.js +43 -75
- package/dist/cpsat/rules/must-assign.js.map +1 -1
- package/dist/cpsat/rules/overtime-daily-multiplier.d.ts +6 -10
- package/dist/cpsat/rules/overtime-daily-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-daily-multiplier.js +118 -112
- package/dist/cpsat/rules/overtime-daily-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-daily-surcharge.d.ts +6 -11
- package/dist/cpsat/rules/overtime-daily-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-daily-surcharge.js +104 -99
- package/dist/cpsat/rules/overtime-daily-surcharge.js.map +1 -1
- package/dist/cpsat/rules/overtime-tiered-multiplier.d.ts +9 -21
- package/dist/cpsat/rules/overtime-tiered-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-tiered-multiplier.js +181 -199
- package/dist/cpsat/rules/overtime-tiered-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-multiplier.d.ts +13 -12
- package/dist/cpsat/rules/overtime-weekly-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-multiplier.js +143 -143
- package/dist/cpsat/rules/overtime-weekly-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-surcharge.d.ts +7 -11
- package/dist/cpsat/rules/overtime-weekly-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-surcharge.js +124 -119
- package/dist/cpsat/rules/overtime-weekly-surcharge.js.map +1 -1
- package/dist/cpsat/rules/pattern-eligibility.d.ts +6 -0
- package/dist/cpsat/rules/pattern-eligibility.d.ts.map +1 -0
- package/dist/cpsat/rules/pattern-eligibility.js +16 -0
- package/dist/cpsat/rules/pattern-eligibility.js.map +1 -0
- package/dist/cpsat/rules/pattern-time.d.ts +5 -0
- package/dist/cpsat/rules/pattern-time.d.ts.map +1 -0
- package/dist/cpsat/rules/pattern-time.js +20 -0
- package/dist/cpsat/rules/pattern-time.js.map +1 -0
- package/dist/cpsat/rules/registry.d.ts +217 -30
- package/dist/cpsat/rules/registry.d.ts.map +1 -1
- package/dist/cpsat/rules/registry.js +98 -34
- package/dist/cpsat/rules/registry.js.map +1 -1
- package/dist/cpsat/rules/resolver.d.ts +9 -7
- package/dist/cpsat/rules/resolver.d.ts.map +1 -1
- package/dist/cpsat/rules/resolver.js +19 -18
- package/dist/cpsat/rules/resolver.js.map +1 -1
- package/dist/cpsat/rules/role-preference.d.ts +24 -0
- package/dist/cpsat/rules/role-preference.d.ts.map +1 -0
- package/dist/cpsat/rules/role-preference.js +72 -0
- package/dist/cpsat/rules/role-preference.js.map +1 -0
- package/dist/cpsat/rules/rules.types.d.ts +90 -17
- package/dist/cpsat/rules/rules.types.d.ts.map +1 -1
- package/dist/cpsat/rules/scope.types.d.ts +24 -11
- package/dist/cpsat/rules/scope.types.d.ts.map +1 -1
- package/dist/cpsat/rules/scope.types.js +14 -19
- package/dist/cpsat/rules/scope.types.js.map +1 -1
- package/dist/cpsat/rules/target-days-week.d.ts +31 -0
- package/dist/cpsat/rules/target-days-week.d.ts.map +1 -0
- package/dist/cpsat/rules/target-days-week.js +80 -0
- package/dist/cpsat/rules/target-days-week.js.map +1 -0
- package/dist/cpsat/rules/target-peak-concurrent-assignments.d.ts +33 -0
- package/dist/cpsat/rules/target-peak-concurrent-assignments.d.ts.map +1 -0
- package/dist/cpsat/rules/target-peak-concurrent-assignments.js +146 -0
- package/dist/cpsat/rules/target-peak-concurrent-assignments.js.map +1 -0
- package/dist/cpsat/rules/time-cost-surcharge.d.ts +15 -14
- package/dist/cpsat/rules/time-cost-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/time-cost-surcharge.js +82 -96
- package/dist/cpsat/rules/time-cost-surcharge.js.map +1 -1
- package/dist/cpsat/rules/time-off.d.ts +21 -57
- package/dist/cpsat/rules/time-off.d.ts.map +1 -1
- package/dist/cpsat/rules/time-off.js +114 -127
- package/dist/cpsat/rules/time-off.js.map +1 -1
- package/dist/cpsat/rules/variables.d.ts +4 -0
- package/dist/cpsat/rules/variables.d.ts.map +1 -0
- package/dist/cpsat/rules/variables.js +10 -0
- package/dist/cpsat/rules/variables.js.map +1 -0
- package/dist/cpsat/rules.d.ts +20 -3
- package/dist/cpsat/rules.d.ts.map +1 -1
- package/dist/cpsat/rules.js +19 -2
- package/dist/cpsat/rules.js.map +1 -1
- package/dist/cpsat/semantic-time.d.ts +7 -6
- package/dist/cpsat/semantic-time.d.ts.map +1 -1
- package/dist/cpsat/semantic-time.js +15 -28
- package/dist/cpsat/semantic-time.js.map +1 -1
- package/dist/cpsat/types.d.ts +47 -4
- package/dist/cpsat/types.d.ts.map +1 -1
- package/dist/cpsat/types.js +24 -1
- package/dist/cpsat/types.js.map +1 -1
- package/dist/cpsat/utils.d.ts +23 -6
- package/dist/cpsat/utils.d.ts.map +1 -1
- package/dist/cpsat/utils.js +76 -15
- package/dist/cpsat/utils.js.map +1 -1
- package/dist/cpsat/validation-reporter.d.ts +6 -2
- package/dist/cpsat/validation-reporter.d.ts.map +1 -1
- package/dist/cpsat/validation-reporter.js +122 -10
- package/dist/cpsat/validation-reporter.js.map +1 -1
- package/dist/cpsat/validation.types.d.ts +21 -10
- package/dist/cpsat/validation.types.d.ts.map +1 -1
- package/dist/datetime.utils.d.ts +7 -13
- package/dist/datetime.utils.d.ts.map +1 -1
- package/dist/datetime.utils.js +29 -36
- package/dist/datetime.utils.js.map +1 -1
- package/dist/index.d.ts +12 -8
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +8 -3
- package/dist/index.js.map +1 -1
- package/dist/schedule/cost.d.ts +48 -60
- package/dist/schedule/cost.d.ts.map +1 -1
- package/dist/schedule/cost.js +15 -51
- package/dist/schedule/cost.js.map +1 -1
- package/dist/schedule/coverage.d.ts +57 -28
- package/dist/schedule/coverage.d.ts.map +1 -1
- package/dist/schedule/coverage.js +24 -1
- package/dist/schedule/coverage.js.map +1 -1
- package/dist/schedule/definition.d.ts +138 -19
- package/dist/schedule/definition.d.ts.map +1 -1
- package/dist/schedule/definition.js +99 -90
- package/dist/schedule/definition.js.map +1 -1
- package/dist/schedule/index.d.ts +4 -4
- package/dist/schedule/index.d.ts.map +1 -1
- package/dist/schedule/index.js +2 -2
- package/dist/schedule/index.js.map +1 -1
- package/dist/schedule/rules.d.ts +438 -113
- package/dist/schedule/rules.d.ts.map +1 -1
- package/dist/schedule/rules.js +310 -108
- package/dist/schedule/rules.js.map +1 -1
- package/dist/schedule/shift-patterns.d.ts +0 -17
- package/dist/schedule/shift-patterns.d.ts.map +1 -1
- package/dist/schedule/shift-patterns.js +0 -17
- package/dist/schedule/shift-patterns.js.map +1 -1
- package/dist/schedule/time-periods.d.ts +37 -27
- package/dist/schedule/time-periods.d.ts.map +1 -1
- package/dist/schedule/time-periods.js +37 -27
- package/dist/schedule/time-periods.js.map +1 -1
- package/dist/types.d.ts +67 -3
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +64 -0
- package/dist/types.js.map +1 -1
- package/package.json +8 -9
- package/solver/src/solver/models.py +41 -4
- package/solver/src/solver/solver.py +546 -157
- package/solver/tests/test_solver.py +363 -7
- package/src/client.schemas.ts +127 -10
- package/src/client.ts +3 -0
- package/src/client.types.ts +73 -7
- package/src/cpsat/cost.ts +17 -7
- package/src/cpsat/model-builder.ts +614 -129
- package/src/cpsat/response.ts +57 -13
- package/src/cpsat/rule-descriptor.ts +311 -0
- package/src/cpsat/rules/artifacts.ts +56 -0
- package/src/cpsat/rules/assign-together.ts +104 -69
- package/src/cpsat/rules/assigned-day.ts +70 -0
- package/src/cpsat/rules/assignment-priority.ts +54 -58
- package/src/cpsat/rules/assignment-terms.ts +43 -0
- package/src/cpsat/rules/concurrent-intervals.ts +93 -0
- package/src/cpsat/rules/cost-utils.ts +1 -9
- package/src/cpsat/rules/day-cost-multiplier.ts +101 -81
- package/src/cpsat/rules/day-cost-surcharge.ts +91 -70
- package/src/cpsat/rules/index.ts +30 -24
- package/src/cpsat/rules/location-preference.ts +47 -52
- package/src/cpsat/rules/max-concurrent-assignments.ts +170 -0
- package/src/cpsat/rules/max-consecutive-days.ts +74 -91
- package/src/cpsat/rules/max-days-of-week-per-period.ts +127 -0
- package/src/cpsat/rules/max-days-week.ts +89 -115
- package/src/cpsat/rules/max-hours-day.ts +64 -84
- package/src/cpsat/rules/max-hours-week.ts +74 -90
- package/src/cpsat/rules/max-shifts-day.ts +65 -85
- package/src/cpsat/rules/min-consecutive-days.ts +161 -127
- package/src/cpsat/rules/min-days-of-week-per-period.ts +144 -0
- package/src/cpsat/rules/min-days-week.ts +93 -91
- package/src/cpsat/rules/min-hours-day.ts +79 -58
- package/src/cpsat/rules/min-hours-week.ts +87 -62
- package/src/cpsat/rules/min-rest-between-shifts.ts +191 -178
- package/src/cpsat/rules/minimize-cost.ts +175 -188
- package/src/cpsat/rules/must-assign.ts +44 -81
- package/src/cpsat/rules/overtime-daily-multiplier.ts +158 -140
- package/src/cpsat/rules/overtime-daily-surcharge.ts +141 -126
- package/src/cpsat/rules/overtime-tiered-multiplier.ts +234 -253
- package/src/cpsat/rules/overtime-weekly-multiplier.ts +183 -175
- package/src/cpsat/rules/overtime-weekly-surcharge.ts +161 -150
- package/src/cpsat/rules/pattern-eligibility.ts +26 -0
- package/src/cpsat/rules/pattern-time.ts +30 -0
- package/src/cpsat/rules/registry.ts +140 -62
- package/src/cpsat/rules/resolver.ts +58 -30
- package/src/cpsat/rules/role-preference.ts +92 -0
- package/src/cpsat/rules/rules.types.ts +89 -17
- package/src/cpsat/rules/scope.types.ts +31 -26
- package/src/cpsat/rules/target-days-week.ts +105 -0
- package/src/cpsat/rules/target-peak-concurrent-assignments.ts +212 -0
- package/src/cpsat/rules/time-cost-surcharge.ts +116 -122
- package/src/cpsat/rules/time-off.ts +154 -163
- package/src/cpsat/rules/variables.ts +11 -0
- package/src/cpsat/rules.ts +43 -17
- package/src/cpsat/semantic-time.ts +29 -43
- package/src/cpsat/types.ts +53 -4
- package/src/cpsat/utils.ts +92 -20
- package/src/cpsat/validation-reporter.ts +170 -19
- package/src/cpsat/validation.types.ts +22 -11
- package/src/datetime.utils.ts +45 -44
- package/src/index.ts +64 -12
- package/src/schedule/cost.ts +40 -61
- package/src/schedule/coverage.ts +57 -28
- package/src/schedule/definition.ts +565 -76
- package/src/schedule/index.ts +23 -3
- package/src/schedule/rules.ts +631 -132
- package/src/schedule/shift-patterns.ts +0 -17
- package/src/schedule/time-periods.ts +37 -27
- package/src/types.ts +114 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-rest-between-shifts.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"min-rest-between-shifts.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-rest-between-shifts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,7 @@
|
|
|
1
1
|
import type * as z from "zod";
|
|
2
|
-
import type { CompilationRule } from "../model-builder.js";
|
|
3
2
|
declare const MinimizeCostSchema: z.ZodIntersection<z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>, z.ZodType<import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">, unknown>>>;
|
|
4
|
-
/** Configuration for {@link
|
|
3
|
+
/** Configuration for {@link minimizeCostRuleDescriptor}. */
|
|
5
4
|
export type MinimizeCostConfig = z.infer<typeof MinimizeCostSchema>;
|
|
6
|
-
|
|
7
|
-
* Creates the minimize-cost rule.
|
|
8
|
-
*
|
|
9
|
-
* **Hourly members:** adds a penalty proportional to
|
|
10
|
-
* `hourlyRate * shiftDurationMinutes / 60` for each assignment.
|
|
11
|
-
*
|
|
12
|
-
* **Salaried members:** zero marginal cost up to their contracted hours.
|
|
13
|
-
* A boolean variable tracks whether the member has any assignment in a
|
|
14
|
-
* given week. When active, their full weekly salary (`annual / 52`) is
|
|
15
|
-
* added as a penalty. This causes the solver to load work onto salaried
|
|
16
|
-
* members (who are "free" once activated) before hourly workers.
|
|
17
|
-
*
|
|
18
|
-
* Computes a normalization factor and stores it on the model builder's
|
|
19
|
-
* `costContext` so modifier rules can use the same scale.
|
|
20
|
-
*/
|
|
21
|
-
export declare function createMinimizeCostRule(config: MinimizeCostConfig): CompilationRule;
|
|
5
|
+
export declare const minimizeCostRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"minimize-cost", import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills"> & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
|
|
22
6
|
export {};
|
|
23
7
|
//# sourceMappingURL=minimize-cost.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimize-cost.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"minimize-cost.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,CAAC,MAAM,KAAK,CAAC;AAiB9B,QAAA,MAAM,kBAAkB,mfAEvB,CAAC;AAEF,4DAA4D;AAC5D,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE,eAAO,MAAM,0BAA0B,2PAyLrC,CAAC"}
|
|
@@ -1,185 +1,173 @@
|
|
|
1
|
+
import { defineRuleDescriptor } from "../rule-descriptor.js";
|
|
1
2
|
import { COST_CATEGORY } from "../cost.js";
|
|
2
3
|
import { OBJECTIVE_WEIGHTS, splitIntoWeeks } from "../utils.js";
|
|
3
|
-
import { entityScope,
|
|
4
|
-
import { getHourlyRate, getSalariedPay
|
|
4
|
+
import { entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, timeScope, } from "./scope.types.js";
|
|
5
|
+
import { getHourlyRate, getSalariedPay } from "./cost-utils.js";
|
|
6
|
+
import { patternDurationMinutes } from "./pattern-time.js";
|
|
5
7
|
const MinimizeCostSchema = entityScope(["members", "roles", "skills"]).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
return;
|
|
33
|
-
// Compute normalization factor: max raw cost of any single assignment
|
|
34
|
-
// (hourly) or weekly salary (salaried)
|
|
35
|
-
let maxRawCost = 0;
|
|
36
|
-
for (const member of targetMembers) {
|
|
37
|
-
const rate = getHourlyRate(member);
|
|
38
|
-
if (rate !== undefined) {
|
|
39
|
-
for (const pattern of b.shiftPatterns) {
|
|
40
|
-
if (!b.canAssign(member, pattern))
|
|
41
|
-
continue;
|
|
42
|
-
const duration = patternDurationMinutes(pattern);
|
|
43
|
-
const rawCost = (rate * duration) / 60;
|
|
44
|
-
if (rawCost > maxRawCost)
|
|
45
|
-
maxRawCost = rawCost;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
const salaried = getSalariedPay(member);
|
|
49
|
-
if (salaried !== undefined) {
|
|
50
|
-
const weeklyCost = salaried.annual / 52;
|
|
51
|
-
if (weeklyCost > maxRawCost)
|
|
52
|
-
maxRawCost = weeklyCost;
|
|
53
|
-
}
|
|
54
|
-
}
|
|
55
|
-
if (maxRawCost === 0)
|
|
56
|
-
return;
|
|
57
|
-
const normalizationFactor = maxRawCost / OBJECTIVE_WEIGHTS.COST;
|
|
58
|
-
b.costContext = {
|
|
59
|
-
normalizationFactor,
|
|
60
|
-
active: true,
|
|
61
|
-
};
|
|
62
|
-
// Add penalty terms for hourly members
|
|
63
|
-
for (const member of targetMembers) {
|
|
64
|
-
const rate = getHourlyRate(member);
|
|
65
|
-
if (rate !== undefined) {
|
|
66
|
-
for (const pattern of b.shiftPatterns) {
|
|
67
|
-
if (!b.canAssign(member, pattern))
|
|
68
|
-
continue;
|
|
69
|
-
for (const day of activeDays) {
|
|
70
|
-
if (!b.patternAvailableOnDay(pattern, day))
|
|
8
|
+
export const minimizeCostRuleDescriptor = defineRuleDescriptor({
|
|
9
|
+
name: "minimize-cost",
|
|
10
|
+
schema: MinimizeCostSchema,
|
|
11
|
+
compile(config) {
|
|
12
|
+
const entityScopeValue = parseEntityScope(config);
|
|
13
|
+
const timeScopeValue = parseTimeScope(config);
|
|
14
|
+
let resolvedWeekStartsOn = "monday";
|
|
15
|
+
const costArtifact = {
|
|
16
|
+
kind: "cost",
|
|
17
|
+
validation: {
|
|
18
|
+
strategy: "skip",
|
|
19
|
+
category: "no-meaningful-feedback",
|
|
20
|
+
rationale: "Cost optimization influences the objective and contributes post-solve accounting, not validation feedback.",
|
|
21
|
+
},
|
|
22
|
+
compileObjective(builder) {
|
|
23
|
+
resolvedWeekStartsOn = builder.weekStartsOn;
|
|
24
|
+
const targetMembers = resolveMembersFromScope(entityScopeValue, builder.members);
|
|
25
|
+
const activeDays = resolveActiveDaysFromScope(timeScopeValue, builder.days);
|
|
26
|
+
if (targetMembers.length === 0 || activeDays.length === 0)
|
|
27
|
+
return;
|
|
28
|
+
let maxRawCost = 0;
|
|
29
|
+
for (const member of targetMembers) {
|
|
30
|
+
const rate = getHourlyRate(member);
|
|
31
|
+
if (rate !== undefined) {
|
|
32
|
+
for (const pattern of builder.shiftPatterns) {
|
|
33
|
+
if (!builder.canAssign(member, pattern))
|
|
71
34
|
continue;
|
|
72
35
|
const duration = patternDurationMinutes(pattern);
|
|
73
36
|
const rawCost = (rate * duration) / 60;
|
|
74
|
-
|
|
75
|
-
|
|
37
|
+
if (rawCost > maxRawCost)
|
|
38
|
+
maxRawCost = rawCost;
|
|
76
39
|
}
|
|
77
40
|
}
|
|
78
|
-
|
|
41
|
+
const salaried = getSalariedPay(member);
|
|
42
|
+
if (salaried !== undefined) {
|
|
43
|
+
const weeklyCost = salaried.annual / 52;
|
|
44
|
+
if (weeklyCost > maxRawCost)
|
|
45
|
+
maxRawCost = weeklyCost;
|
|
46
|
+
}
|
|
79
47
|
}
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
for (const
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
if (!b.canAssign(member, pattern))
|
|
48
|
+
if (maxRawCost === 0)
|
|
49
|
+
return;
|
|
50
|
+
const normalizationFactor = maxRawCost / OBJECTIVE_WEIGHTS.COST;
|
|
51
|
+
builder.costContext = {
|
|
52
|
+
normalizationFactor,
|
|
53
|
+
active: true,
|
|
54
|
+
};
|
|
55
|
+
for (const member of targetMembers) {
|
|
56
|
+
const rate = getHourlyRate(member);
|
|
57
|
+
if (rate !== undefined) {
|
|
58
|
+
for (const pattern of builder.shiftPatterns) {
|
|
59
|
+
if (!builder.canAssign(member, pattern))
|
|
93
60
|
continue;
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
61
|
+
for (const day of activeDays) {
|
|
62
|
+
if (!builder.patternAvailableOnDay(pattern, day))
|
|
63
|
+
continue;
|
|
64
|
+
const duration = patternDurationMinutes(pattern);
|
|
65
|
+
const rawCost = (rate * duration) / 60;
|
|
66
|
+
const normalizedPenalty = rawCost / normalizationFactor;
|
|
67
|
+
builder.addPenalty(builder.assignment(member.id, pattern.id, day), Math.max(1, normalizedPenalty));
|
|
68
|
+
}
|
|
97
69
|
}
|
|
70
|
+
continue;
|
|
98
71
|
}
|
|
99
|
-
|
|
72
|
+
const salaried = getSalariedPay(member);
|
|
73
|
+
if (salaried === undefined)
|
|
100
74
|
continue;
|
|
101
|
-
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
75
|
+
const weeklyCost = salaried.annual / 52;
|
|
76
|
+
const normalizedWeeklyCost = weeklyCost / normalizationFactor;
|
|
77
|
+
const weeks = splitIntoWeeks(activeDays, builder.weekStartsOn);
|
|
78
|
+
for (const [weekIndex, weekDays] of weeks.entries()) {
|
|
79
|
+
const weekAssignmentVars = [];
|
|
80
|
+
for (const day of weekDays) {
|
|
81
|
+
for (const pattern of builder.shiftPatterns) {
|
|
82
|
+
if (!builder.canAssign(member, pattern))
|
|
83
|
+
continue;
|
|
84
|
+
if (!builder.patternAvailableOnDay(pattern, day))
|
|
85
|
+
continue;
|
|
86
|
+
weekAssignmentVars.push(builder.assignment(member.id, pattern.id, day));
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
if (weekAssignmentVars.length === 0)
|
|
90
|
+
continue;
|
|
91
|
+
const activeVar = builder.boolVar(`active:cost:${member.id}:w${weekIndex}`);
|
|
92
|
+
for (const assignVar of weekAssignmentVars) {
|
|
93
|
+
builder.addLinear([
|
|
94
|
+
{ var: activeVar, coeff: 1 },
|
|
95
|
+
{ var: assignVar, coeff: -1 },
|
|
96
|
+
], ">=", 0);
|
|
97
|
+
}
|
|
98
|
+
builder.addPenalty(activeVar, Math.max(1, Math.round(normalizedWeeklyCost)));
|
|
108
99
|
}
|
|
109
|
-
b.addPenalty(activeVar, Math.max(1, Math.round(normalizedWeeklyCost)));
|
|
110
|
-
}
|
|
111
|
-
}
|
|
112
|
-
},
|
|
113
|
-
cost(assignments, members, shiftPatterns) {
|
|
114
|
-
const memberMap = new Map(members.map((m) => [m.id, m]));
|
|
115
|
-
const patternMap = new Map(shiftPatterns.map((p) => [p.id, p]));
|
|
116
|
-
const allDays = [...new Set(assignments.map((a) => a.day))].toSorted();
|
|
117
|
-
const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, allDays));
|
|
118
|
-
const targetMemberIds = new Set(resolveMembersFromScope(entityScopeValue, [...members]).map((m) => m.id));
|
|
119
|
-
const entries = [];
|
|
120
|
-
// Track which salaried members are active per week for weekly cost
|
|
121
|
-
const salariedWeekActive = new Map();
|
|
122
|
-
for (const a of assignments) {
|
|
123
|
-
if (!activeDays.has(a.day))
|
|
124
|
-
continue;
|
|
125
|
-
if (!targetMemberIds.has(a.memberId))
|
|
126
|
-
continue;
|
|
127
|
-
const member = memberMap.get(a.memberId);
|
|
128
|
-
if (!member)
|
|
129
|
-
continue;
|
|
130
|
-
const pattern = patternMap.get(a.shiftPatternId);
|
|
131
|
-
if (!pattern)
|
|
132
|
-
continue;
|
|
133
|
-
const duration = patternDurationMinutes(pattern);
|
|
134
|
-
const rate = getHourlyRate(member);
|
|
135
|
-
if (rate !== undefined) {
|
|
136
|
-
entries.push({
|
|
137
|
-
memberId: a.memberId,
|
|
138
|
-
day: a.day,
|
|
139
|
-
category: COST_CATEGORY.BASE,
|
|
140
|
-
amount: (rate * duration) / 60,
|
|
141
|
-
});
|
|
142
|
-
continue;
|
|
143
100
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
}
|
|
155
|
-
// Compute salaried costs: weekly salary distributed across active days
|
|
156
|
-
for (const [memberId, activeDaysSet] of salariedWeekActive) {
|
|
157
|
-
const member = memberMap.get(memberId);
|
|
158
|
-
if (!member)
|
|
159
|
-
continue;
|
|
160
|
-
const salaried = getSalariedPay(member);
|
|
161
|
-
if (!salaried)
|
|
162
|
-
continue;
|
|
163
|
-
const activeList = [...activeDaysSet].toSorted();
|
|
164
|
-
const weeks = splitIntoWeeks(activeList, resolvedWeekStartsOn);
|
|
165
|
-
for (const weekDays of weeks) {
|
|
166
|
-
if (weekDays.length === 0)
|
|
101
|
+
},
|
|
102
|
+
calculateCost(assignments, costContext) {
|
|
103
|
+
const memberMap = new Map(costContext.members.map((member) => [member.id, member]));
|
|
104
|
+
const patternMap = new Map(costContext.shiftPatterns.map((pattern) => [pattern.id, pattern]));
|
|
105
|
+
const activeDays = new Set(resolveActiveDaysFromScope(timeScopeValue, [...costContext.days]).map((day) => day.iso));
|
|
106
|
+
const targetMemberIds = new Set(resolveMembersFromScope(entityScopeValue, [...costContext.members]).map((member) => member.id));
|
|
107
|
+
const entries = [];
|
|
108
|
+
const salariedWeekActive = new Map();
|
|
109
|
+
for (const assignment of assignments) {
|
|
110
|
+
if (!activeDays.has(assignment.day) || !targetMemberIds.has(assignment.memberId))
|
|
167
111
|
continue;
|
|
168
|
-
const
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
112
|
+
const member = memberMap.get(assignment.memberId);
|
|
113
|
+
if (!member)
|
|
114
|
+
continue;
|
|
115
|
+
const pattern = patternMap.get(assignment.shiftPatternId);
|
|
116
|
+
if (!pattern)
|
|
117
|
+
continue;
|
|
118
|
+
const duration = patternDurationMinutes(pattern);
|
|
119
|
+
const rate = getHourlyRate(member);
|
|
120
|
+
if (rate !== undefined) {
|
|
172
121
|
entries.push({
|
|
173
|
-
memberId,
|
|
174
|
-
day,
|
|
122
|
+
memberId: assignment.memberId,
|
|
123
|
+
day: assignment.day,
|
|
175
124
|
category: COST_CATEGORY.BASE,
|
|
176
|
-
amount:
|
|
125
|
+
amount: (rate * duration) / 60,
|
|
177
126
|
});
|
|
127
|
+
continue;
|
|
128
|
+
}
|
|
129
|
+
const salaried = getSalariedPay(member);
|
|
130
|
+
if (salaried === undefined)
|
|
131
|
+
continue;
|
|
132
|
+
let memberDays = salariedWeekActive.get(assignment.memberId);
|
|
133
|
+
if (!memberDays) {
|
|
134
|
+
memberDays = new Set();
|
|
135
|
+
salariedWeekActive.set(assignment.memberId, memberDays);
|
|
136
|
+
}
|
|
137
|
+
memberDays.add(assignment.day);
|
|
138
|
+
}
|
|
139
|
+
for (const [memberId, activeDaysSet] of salariedWeekActive) {
|
|
140
|
+
const member = memberMap.get(memberId);
|
|
141
|
+
if (!member)
|
|
142
|
+
continue;
|
|
143
|
+
const salaried = getSalariedPay(member);
|
|
144
|
+
if (!salaried)
|
|
145
|
+
continue;
|
|
146
|
+
const activeDateSet = new Set(activeDaysSet);
|
|
147
|
+
const activeList = costContext.days.filter((day) => activeDateSet.has(day.iso));
|
|
148
|
+
const weeks = splitIntoWeeks(activeList, resolvedWeekStartsOn);
|
|
149
|
+
for (const weekDays of weeks) {
|
|
150
|
+
if (weekDays.length === 0)
|
|
151
|
+
continue;
|
|
152
|
+
const weeklyCost = salaried.annual / 52;
|
|
153
|
+
const perDay = weeklyCost / weekDays.length;
|
|
154
|
+
for (const day of weekDays) {
|
|
155
|
+
entries.push({
|
|
156
|
+
memberId,
|
|
157
|
+
day: day.iso,
|
|
158
|
+
category: COST_CATEGORY.BASE,
|
|
159
|
+
amount: perDay,
|
|
160
|
+
});
|
|
161
|
+
}
|
|
178
162
|
}
|
|
179
163
|
}
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}
|
|
183
|
-
|
|
184
|
-
|
|
164
|
+
return { entries };
|
|
165
|
+
},
|
|
166
|
+
};
|
|
167
|
+
return {
|
|
168
|
+
rule: "minimize-cost",
|
|
169
|
+
artifacts: [costArtifact],
|
|
170
|
+
};
|
|
171
|
+
},
|
|
172
|
+
});
|
|
185
173
|
//# sourceMappingURL=minimize-cost.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"minimize-cost.js","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"minimize-cost.js","sourceRoot":"","sources":["../../../src/cpsat/rules/minimize-cost.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,49 +1,12 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
|
-
|
|
3
|
-
declare const MustAssignSchema: z.ZodIntersection<z.ZodObject<{
|
|
2
|
+
export declare const MustAssignSchema: z.ZodIntersection<z.ZodObject<{
|
|
4
3
|
weekStartsOn: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"monday">, z.ZodLiteral<"tuesday">, z.ZodLiteral<"wednesday">, z.ZodLiteral<"thursday">, z.ZodLiteral<"friday">, z.ZodLiteral<"saturday">, z.ZodLiteral<"sunday">]>>;
|
|
5
4
|
}, z.core.$strip>, z.ZodType<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown, z.core.$ZodTypeInternals<import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">, unknown>>>;
|
|
6
5
|
/**
|
|
7
|
-
* Configuration for {@link
|
|
8
|
-
*
|
|
9
|
-
* - `weekStartsOn` (optional): which day starts the week; defaults to
|
|
10
|
-
* {@link ModelBuilder.weekStartsOn}
|
|
11
|
-
*
|
|
12
|
-
* Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
|
|
6
|
+
* Configuration for {@link mustAssignRuleDescriptor}.
|
|
13
7
|
*/
|
|
14
8
|
export type MustAssignConfig = z.infer<typeof MustAssignSchema>;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
* @remarks
|
|
19
|
-
* Use this for staffing obligations: salaried employees who are paid
|
|
20
|
-
* regardless of whether they work, or contracted staff who must be
|
|
21
|
-
* rostered. The solver ensures each targeted member has at least one
|
|
22
|
-
* assignment per scheduling week.
|
|
23
|
-
*
|
|
24
|
-
* Always compiles as a soft constraint (HIGH priority internally) so the
|
|
25
|
-
* schedule still generates when a member genuinely cannot be placed
|
|
26
|
-
* (e.g., full week of absences, no compatible shift patterns). Violations
|
|
27
|
-
* surface as validation warnings with distinct messaging from
|
|
28
|
-
* `min-days-week`.
|
|
29
|
-
*
|
|
30
|
-
* Unlike {@link createMinDaysWeekRule}, this rule communicates a staffing
|
|
31
|
-
* obligation rather than a scheduling preference. Validation messages
|
|
32
|
-
* reflect this: "Alice was not assigned (staffing obligation)" rather
|
|
33
|
-
* than "Alice worked 0 days, minimum was 1."
|
|
34
|
-
*
|
|
35
|
-
* @param config - See {@link MustAssignConfig}
|
|
36
|
-
*
|
|
37
|
-
* @example Ensure a salaried manager is always rostered
|
|
38
|
-
* ```ts
|
|
39
|
-
* createMustAssignRule({ memberIds: ["diana"] });
|
|
40
|
-
* ```
|
|
41
|
-
*
|
|
42
|
-
* @example Ensure all supervisors appear on the rota
|
|
43
|
-
* ```ts
|
|
44
|
-
* createMustAssignRule({ roleIds: ["supervisor"] });
|
|
45
|
-
* ```
|
|
46
|
-
*/
|
|
47
|
-
export declare function createMustAssignRule(config: MustAssignConfig): CompilationRule;
|
|
48
|
-
export {};
|
|
9
|
+
export declare const mustAssignRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"must-assign", {
|
|
10
|
+
weekStartsOn?: "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | undefined;
|
|
11
|
+
} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">>;
|
|
49
12
|
//# sourceMappingURL=must-assign.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"must-assign.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/must-assign.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"must-assign.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/must-assign.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAgBzB,eAAO,MAAM,gBAAgB;;iOAIsB,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAEhE,eAAO,MAAM,wBAAwB;;+EA2CnC,CAAC"}
|