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,41 +1,24 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
|
-
|
|
3
|
-
declare const MaxHoursDaySchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
2
|
+
export declare const MaxHoursDaySchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
4
3
|
hours: z.ZodNumber;
|
|
5
|
-
priority: z.ZodDefault<z.
|
|
4
|
+
priority: z.ZodDefault<z.ZodEnum<{
|
|
5
|
+
LOW: "LOW";
|
|
6
|
+
MEDIUM: "MEDIUM";
|
|
7
|
+
HIGH: "HIGH";
|
|
8
|
+
MANDATORY: "MANDATORY";
|
|
9
|
+
}>>;
|
|
6
10
|
}, 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>>>, 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>>>;
|
|
7
11
|
/**
|
|
8
|
-
* Configuration for {@link
|
|
9
|
-
*
|
|
10
|
-
* - `hours` (required): maximum hours allowed per day
|
|
11
|
-
* - `priority` (required): how strictly the solver enforces this rule
|
|
12
|
-
*
|
|
13
|
-
* Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
|
|
14
|
-
* Time scoping (at most one, optional): `dateRange`, `specificDates`, `dayOfWeek`, `recurringPeriods`
|
|
12
|
+
* Configuration for {@link maxHoursDayRuleDescriptor}.
|
|
15
13
|
*/
|
|
16
14
|
export type MaxHoursDayConfig = z.infer<typeof MaxHoursDaySchema>;
|
|
17
15
|
/**
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
* @param config - See {@link MaxHoursDayConfig}
|
|
21
|
-
* @example Limit everyone to 8 hours per day
|
|
22
|
-
* ```ts
|
|
23
|
-
* createMaxHoursDayRule({
|
|
24
|
-
* hours: 8,
|
|
25
|
-
* priority: "MANDATORY",
|
|
26
|
-
* });
|
|
27
|
-
* ```
|
|
16
|
+
* Low-level descriptor for the `max-hours-day` rule.
|
|
28
17
|
*
|
|
29
|
-
* @
|
|
30
|
-
* ```ts
|
|
31
|
-
* createMaxHoursDayRule({
|
|
32
|
-
* roleIds: ["student"],
|
|
33
|
-
* hours: 4,
|
|
34
|
-
* dayOfWeek: ["monday", "tuesday", "wednesday", "thursday", "friday"],
|
|
35
|
-
* priority: "MANDATORY",
|
|
36
|
-
* });
|
|
37
|
-
* ```
|
|
18
|
+
* @category Rules
|
|
38
19
|
*/
|
|
39
|
-
export declare
|
|
40
|
-
|
|
20
|
+
export declare const maxHoursDayRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"max-hours-day", ({
|
|
21
|
+
hours: number;
|
|
22
|
+
priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
|
|
23
|
+
} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
|
|
41
24
|
//# sourceMappingURL=max-hours-day.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"max-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAiBzB,eAAO,MAAM,iBAAiB;;;;;;;;mfAM6C,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;GAIG;AACH,eAAO,MAAM,yBAAyB;;;8LAyDpC,CAAC"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
|
+
import { defineRuleDescriptor } from "../rule-descriptor.js";
|
|
2
3
|
import { priorityToPenalty } from "../utils.js";
|
|
3
|
-
import { PrioritySchema, entityScope,
|
|
4
|
-
|
|
4
|
+
import { PrioritySchema, entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, ruleGroup, timeScope, } from "./scope.types.js";
|
|
5
|
+
import { assignmentTermsForDay } from "./assignment-terms.js";
|
|
6
|
+
import { patternDurationMinutes } from "./pattern-time.js";
|
|
7
|
+
import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
|
|
8
|
+
export const MaxHoursDaySchema = z
|
|
5
9
|
.object({
|
|
6
10
|
hours: z.number().min(0),
|
|
7
11
|
priority: PrioritySchema,
|
|
@@ -9,76 +13,56 @@ const MaxHoursDaySchema = z
|
|
|
9
13
|
.and(entityScope(["members", "roles", "skills"]))
|
|
10
14
|
.and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
|
|
11
15
|
/**
|
|
12
|
-
*
|
|
16
|
+
* Low-level descriptor for the `max-hours-day` rule.
|
|
13
17
|
*
|
|
14
|
-
* @
|
|
15
|
-
* @example Limit everyone to 8 hours per day
|
|
16
|
-
* ```ts
|
|
17
|
-
* createMaxHoursDayRule({
|
|
18
|
-
* hours: 8,
|
|
19
|
-
* priority: "MANDATORY",
|
|
20
|
-
* });
|
|
21
|
-
* ```
|
|
22
|
-
*
|
|
23
|
-
* @example Students limited to 4 hours on weekdays during term
|
|
24
|
-
* ```ts
|
|
25
|
-
* createMaxHoursDayRule({
|
|
26
|
-
* roleIds: ["student"],
|
|
27
|
-
* hours: 4,
|
|
28
|
-
* dayOfWeek: ["monday", "tuesday", "wednesday", "thursday", "friday"],
|
|
29
|
-
* priority: "MANDATORY",
|
|
30
|
-
* });
|
|
31
|
-
* ```
|
|
18
|
+
* @category Rules
|
|
32
19
|
*/
|
|
33
|
-
export
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
},
|
|
82
|
-
};
|
|
83
|
-
}
|
|
20
|
+
export const maxHoursDayRuleDescriptor = defineRuleDescriptor({
|
|
21
|
+
name: "max-hours-day",
|
|
22
|
+
schema: MaxHoursDaySchema,
|
|
23
|
+
compile(config, ctx) {
|
|
24
|
+
const entityScopeValue = parseEntityScope(config);
|
|
25
|
+
const timeScopeValue = parseTimeScope(config);
|
|
26
|
+
const { hours, priority } = config;
|
|
27
|
+
const maxMinutes = hours * 60;
|
|
28
|
+
const group = ruleGroup(`max-hours-day:${hours}`, `Max ${hours}h per day`, entityScopeValue, timeScopeValue);
|
|
29
|
+
const targetMembers = resolveMembersFromScope(entityScopeValue, [...ctx.members]);
|
|
30
|
+
const activeDays = resolveActiveDaysFromScope(timeScopeValue, [...ctx.days]);
|
|
31
|
+
const artifacts = targetMembers.flatMap((member) => activeDays.flatMap((day) => {
|
|
32
|
+
const terms = assignmentTermsForDay(member, day, ctx.shiftPatterns, patternDurationMinutes);
|
|
33
|
+
if (terms.length === 0)
|
|
34
|
+
return [];
|
|
35
|
+
const description = `${member.id} max ${hours}h on ${day.iso}`;
|
|
36
|
+
const context = { memberIds: [member.id], days: [day.iso] };
|
|
37
|
+
const constraintId = `max-hours-day:${member.id}:${day.iso}`;
|
|
38
|
+
return [
|
|
39
|
+
priority === "MANDATORY"
|
|
40
|
+
? hardConstraint({
|
|
41
|
+
group,
|
|
42
|
+
description,
|
|
43
|
+
context,
|
|
44
|
+
validation: reportValidation(constraintId),
|
|
45
|
+
terms,
|
|
46
|
+
comparator: "<=",
|
|
47
|
+
targetValue: maxMinutes,
|
|
48
|
+
})
|
|
49
|
+
: softConstraint({
|
|
50
|
+
group,
|
|
51
|
+
description,
|
|
52
|
+
context,
|
|
53
|
+
validation: reportValidation(),
|
|
54
|
+
terms,
|
|
55
|
+
comparator: "<=",
|
|
56
|
+
targetValue: maxMinutes,
|
|
57
|
+
penalty: priorityToPenalty(priority),
|
|
58
|
+
constraintId,
|
|
59
|
+
}),
|
|
60
|
+
];
|
|
61
|
+
}));
|
|
62
|
+
return {
|
|
63
|
+
rule: "max-hours-day",
|
|
64
|
+
artifacts,
|
|
65
|
+
};
|
|
66
|
+
},
|
|
67
|
+
});
|
|
84
68
|
//# sourceMappingURL=max-hours-day.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-hours-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"max-hours-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-day.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,42 +1,26 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
|
-
|
|
3
|
-
declare const MaxHoursWeekSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
2
|
+
export declare const MaxHoursWeekSchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
4
3
|
hours: z.ZodNumber;
|
|
5
|
-
priority: z.ZodDefault<z.
|
|
4
|
+
priority: z.ZodDefault<z.ZodEnum<{
|
|
5
|
+
LOW: "LOW";
|
|
6
|
+
MEDIUM: "MEDIUM";
|
|
7
|
+
HIGH: "HIGH";
|
|
8
|
+
MANDATORY: "MANDATORY";
|
|
9
|
+
}>>;
|
|
6
10
|
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">]>>;
|
|
7
11
|
}, 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>>>, 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>>>;
|
|
8
12
|
/**
|
|
9
|
-
* Configuration for {@link
|
|
10
|
-
*
|
|
11
|
-
* - `hours` (required): maximum hours allowed per scheduling week
|
|
12
|
-
* - `priority` (required): how strictly the solver enforces this rule
|
|
13
|
-
* - `weekStartsOn` (optional): which day starts the week; defaults to {@link ModelBuilder.weekStartsOn}
|
|
14
|
-
*
|
|
15
|
-
* Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
|
|
16
|
-
* Time scoping (at most one, optional): `dateRange`, `specificDates`, `dayOfWeek`, `recurringPeriods`
|
|
13
|
+
* Configuration for {@link maxHoursWeekRuleDescriptor}.
|
|
17
14
|
*/
|
|
18
15
|
export type MaxHoursWeekConfig = z.infer<typeof MaxHoursWeekSchema>;
|
|
19
16
|
/**
|
|
20
|
-
*
|
|
21
|
-
*
|
|
22
|
-
* @param config - See {@link MaxHoursWeekConfig}
|
|
23
|
-
* @example Limit everyone to 40 hours per week
|
|
24
|
-
* ```ts
|
|
25
|
-
* createMaxHoursWeekRule({ hours: 40, priority: "HIGH" });
|
|
26
|
-
* ```
|
|
17
|
+
* Low-level descriptor for the `max-hours-week` rule.
|
|
27
18
|
*
|
|
28
|
-
* @
|
|
29
|
-
* ```ts
|
|
30
|
-
* createMaxHoursWeekRule({
|
|
31
|
-
* roleIds: ["student"],
|
|
32
|
-
* hours: 20,
|
|
33
|
-
* recurringPeriods: [
|
|
34
|
-
* { name: "fall-term", startMonth: 9, startDay: 1, endMonth: 12, endDay: 15 },
|
|
35
|
-
* ],
|
|
36
|
-
* priority: "MANDATORY",
|
|
37
|
-
* });
|
|
38
|
-
* ```
|
|
19
|
+
* @category Rules
|
|
39
20
|
*/
|
|
40
|
-
export declare
|
|
41
|
-
|
|
21
|
+
export declare const maxHoursWeekRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"max-hours-week", ({
|
|
22
|
+
hours: number;
|
|
23
|
+
priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
|
|
24
|
+
weekStartsOn?: "monday" | "tuesday" | "wednesday" | "thursday" | "friday" | "saturday" | "sunday" | undefined;
|
|
25
|
+
} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
|
|
42
26
|
//# sourceMappingURL=max-hours-week.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"max-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAwBzB,eAAO,MAAM,kBAAkB;;;;;;;;;mfAE2C,CAAC;AAE3E;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;GAIG;AACH,eAAO,MAAM,0BAA0B;;;;8LAkErC,CAAC"}
|
|
@@ -1,87 +1,72 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { DayOfWeekSchema } from "../../types.js";
|
|
3
|
+
import { defineRuleDescriptor } from "../rule-descriptor.js";
|
|
3
4
|
import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
|
|
4
|
-
import { PrioritySchema, entityScope,
|
|
5
|
+
import { PrioritySchema, entityScope, parseEntityScope, parseTimeScope, resolveActiveDaysFromScope, resolveMembersFromScope, ruleGroup, timeScope, } from "./scope.types.js";
|
|
6
|
+
import { assignmentTermsForDays } from "./assignment-terms.js";
|
|
7
|
+
import { patternDurationMinutes } from "./pattern-time.js";
|
|
8
|
+
import { hardConstraint, reportValidation, softConstraint } from "./artifacts.js";
|
|
5
9
|
const MaxHoursWeekBase = z.object({
|
|
6
10
|
hours: z.number().min(0),
|
|
7
11
|
priority: PrioritySchema,
|
|
8
12
|
weekStartsOn: DayOfWeekSchema.optional(),
|
|
9
13
|
});
|
|
10
|
-
const MaxHoursWeekSchema = MaxHoursWeekBase.and(entityScope(["members", "roles", "skills"])).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
|
|
14
|
+
export const MaxHoursWeekSchema = MaxHoursWeekBase.and(entityScope(["members", "roles", "skills"])).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
|
|
11
15
|
/**
|
|
12
|
-
*
|
|
16
|
+
* Low-level descriptor for the `max-hours-week` rule.
|
|
13
17
|
*
|
|
14
|
-
* @
|
|
15
|
-
* @example Limit everyone to 40 hours per week
|
|
16
|
-
* ```ts
|
|
17
|
-
* createMaxHoursWeekRule({ hours: 40, priority: "HIGH" });
|
|
18
|
-
* ```
|
|
19
|
-
*
|
|
20
|
-
* @example Students limited to 20 hours during term time
|
|
21
|
-
* ```ts
|
|
22
|
-
* createMaxHoursWeekRule({
|
|
23
|
-
* roleIds: ["student"],
|
|
24
|
-
* hours: 20,
|
|
25
|
-
* recurringPeriods: [
|
|
26
|
-
* { name: "fall-term", startMonth: 9, startDay: 1, endMonth: 12, endDay: 15 },
|
|
27
|
-
* ],
|
|
28
|
-
* priority: "MANDATORY",
|
|
29
|
-
* });
|
|
30
|
-
* ```
|
|
18
|
+
* @category Rules
|
|
31
19
|
*/
|
|
32
|
-
export
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
},
|
|
85
|
-
};
|
|
86
|
-
}
|
|
20
|
+
export const maxHoursWeekRuleDescriptor = defineRuleDescriptor({
|
|
21
|
+
name: "max-hours-week",
|
|
22
|
+
schema: MaxHoursWeekSchema,
|
|
23
|
+
compile(config, ctx) {
|
|
24
|
+
const entityScopeValue = parseEntityScope(config);
|
|
25
|
+
const timeScopeValue = parseTimeScope(config);
|
|
26
|
+
const { hours, priority, weekStartsOn } = config;
|
|
27
|
+
const maxMinutes = hours * 60;
|
|
28
|
+
const group = ruleGroup(`max-hours-week:${hours}`, `Max ${hours}h per week`, entityScopeValue, timeScopeValue);
|
|
29
|
+
const targetMembers = resolveMembersFromScope(entityScopeValue, [...ctx.members]);
|
|
30
|
+
const activeDays = resolveActiveDaysFromScope(timeScopeValue, [...ctx.days]);
|
|
31
|
+
const weeks = splitIntoWeeks(activeDays, weekStartsOn ?? ctx.weekStartsOn);
|
|
32
|
+
const artifacts = targetMembers.flatMap((member) => weeks.flatMap((weekDays) => {
|
|
33
|
+
const weekStart = weekDays[0];
|
|
34
|
+
if (!weekStart)
|
|
35
|
+
return [];
|
|
36
|
+
const terms = assignmentTermsForDays(member, weekDays, ctx.shiftPatterns, patternDurationMinutes);
|
|
37
|
+
if (terms.length === 0)
|
|
38
|
+
return [];
|
|
39
|
+
const description = `${member.id} max ${hours}h in week starting ${weekStart.iso}`;
|
|
40
|
+
const context = { memberIds: [member.id], days: weekDays.map((day) => day.iso) };
|
|
41
|
+
const constraintId = `max-hours-week:${member.id}:${weekStart.iso}`;
|
|
42
|
+
return [
|
|
43
|
+
priority === "MANDATORY"
|
|
44
|
+
? hardConstraint({
|
|
45
|
+
group,
|
|
46
|
+
description,
|
|
47
|
+
context,
|
|
48
|
+
validation: reportValidation(constraintId),
|
|
49
|
+
terms,
|
|
50
|
+
comparator: "<=",
|
|
51
|
+
targetValue: maxMinutes,
|
|
52
|
+
})
|
|
53
|
+
: softConstraint({
|
|
54
|
+
group,
|
|
55
|
+
description,
|
|
56
|
+
context,
|
|
57
|
+
validation: reportValidation(),
|
|
58
|
+
terms,
|
|
59
|
+
comparator: "<=",
|
|
60
|
+
targetValue: maxMinutes,
|
|
61
|
+
penalty: priorityToPenalty(priority),
|
|
62
|
+
constraintId,
|
|
63
|
+
}),
|
|
64
|
+
];
|
|
65
|
+
}));
|
|
66
|
+
return {
|
|
67
|
+
rule: "max-hours-week",
|
|
68
|
+
artifacts,
|
|
69
|
+
};
|
|
70
|
+
},
|
|
71
|
+
});
|
|
87
72
|
//# sourceMappingURL=max-hours-week.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"max-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-week.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,44 +1,28 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
|
-
|
|
3
|
-
declare const MaxShiftsDaySchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
2
|
+
export declare const MaxShiftsDaySchema: z.ZodIntersection<z.ZodIntersection<z.ZodObject<{
|
|
4
3
|
shifts: z.ZodNumber;
|
|
5
|
-
priority: z.ZodDefault<z.
|
|
4
|
+
priority: z.ZodDefault<z.ZodEnum<{
|
|
5
|
+
LOW: "LOW";
|
|
6
|
+
MEDIUM: "MEDIUM";
|
|
7
|
+
HIGH: "HIGH";
|
|
8
|
+
MANDATORY: "MANDATORY";
|
|
9
|
+
}>>;
|
|
6
10
|
}, 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>>>, 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>>>;
|
|
7
11
|
/**
|
|
8
|
-
* Configuration for {@link
|
|
9
|
-
*
|
|
10
|
-
* - `shifts` (required): maximum number of shifts per day (at least 1)
|
|
11
|
-
* - `priority` (required): how strictly the solver enforces this rule
|
|
12
|
-
*
|
|
13
|
-
* Entity scoping (at most one): `memberIds`, `roleIds`, `skillIds`
|
|
14
|
-
* Time scoping (at most one, optional): `dateRange`, `specificDates`, `dayOfWeek`, `recurringPeriods`
|
|
12
|
+
* Configuration for {@link maxShiftsDayRuleDescriptor}.
|
|
15
13
|
*/
|
|
16
14
|
export type MaxShiftsDayConfig = z.infer<typeof MaxShiftsDaySchema>;
|
|
17
15
|
/**
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
* Controls the maximum number of distinct shift assignments per day,
|
|
21
|
-
* regardless of shift duration. For limiting total hours worked, use `max-hours-day`.
|
|
16
|
+
* Low-level descriptor for the `max-shifts-day` rule.
|
|
22
17
|
*
|
|
23
|
-
* @
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
* createMaxShiftsDayRule({
|
|
27
|
-
* shifts: 1,
|
|
28
|
-
* priority: "MANDATORY",
|
|
29
|
-
* });
|
|
30
|
-
* ```
|
|
18
|
+
* @remarks
|
|
19
|
+
* This rule limits distinct assignments per day, regardless of their duration.
|
|
20
|
+
* Use {@link maxHoursDayRuleDescriptor} to limit assigned time instead.
|
|
31
21
|
*
|
|
32
|
-
* @
|
|
33
|
-
* ```ts
|
|
34
|
-
* createMaxShiftsDayRule({
|
|
35
|
-
* roleIds: ["student"],
|
|
36
|
-
* shifts: 2,
|
|
37
|
-
* dayOfWeek: ["saturday", "sunday"],
|
|
38
|
-
* priority: "MANDATORY",
|
|
39
|
-
* });
|
|
40
|
-
* ```
|
|
22
|
+
* @category Rules
|
|
41
23
|
*/
|
|
42
|
-
export declare
|
|
43
|
-
|
|
24
|
+
export declare const maxShiftsDayRuleDescriptor: import("../rule-descriptor.js").RuleDescriptor<"max-shifts-day", ({
|
|
25
|
+
shifts: number;
|
|
26
|
+
priority: "LOW" | "MEDIUM" | "HIGH" | "MANDATORY";
|
|
27
|
+
} & import("./scope.types.js").EntityScopeType<"members" | "roles" | "skills">) & import("./scope.types.js").OptionalTimeScopeType<"dateRange" | "dayOfWeek" | "specificDates" | "recurring">>;
|
|
44
28
|
//# sourceMappingURL=max-shifts-day.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-shifts-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-shifts-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"max-shifts-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/max-shifts-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAgBzB,eAAO,MAAM,kBAAkB;;;;;;;;mfAM4C,CAAC;AAE5E;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;GAQG;AACH,eAAO,MAAM,0BAA0B;;;8LAwDrC,CAAC"}
|