dabke 0.81.1 → 0.83.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 +58 -0
- package/README.md +45 -27
- package/dist/client.d.ts +20 -2
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +4 -1
- package/dist/client.js.map +1 -1
- package/dist/client.types.d.ts +9 -0
- package/dist/client.types.d.ts.map +1 -1
- package/dist/client.types.js +1 -0
- package/dist/client.types.js.map +1 -1
- package/dist/cpsat/model-builder.d.ts +9 -0
- package/dist/cpsat/model-builder.d.ts.map +1 -1
- package/dist/cpsat/model-builder.js +36 -34
- package/dist/cpsat/model-builder.js.map +1 -1
- package/dist/cpsat/response.d.ts +13 -1
- package/dist/cpsat/response.d.ts.map +1 -1
- package/dist/cpsat/response.js +4 -0
- package/dist/cpsat/response.js.map +1 -1
- package/dist/cpsat/rules/cost-utils.d.ts +11 -0
- package/dist/cpsat/rules/cost-utils.d.ts.map +1 -0
- package/dist/cpsat/rules/cost-utils.js +24 -0
- package/dist/cpsat/rules/cost-utils.js.map +1 -0
- package/dist/cpsat/rules/day-cost-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/day-cost-multiplier.js +3 -14
- package/dist/cpsat/rules/day-cost-multiplier.js.map +1 -1
- package/dist/cpsat/rules/day-cost-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/day-cost-surcharge.js +3 -7
- package/dist/cpsat/rules/day-cost-surcharge.js.map +1 -1
- package/dist/cpsat/rules/index.d.ts +3 -0
- package/dist/cpsat/rules/index.d.ts.map +1 -1
- package/dist/cpsat/rules/index.js +3 -0
- package/dist/cpsat/rules/index.js.map +1 -1
- package/dist/cpsat/rules/max-consecutive-days.d.ts.map +1 -1
- package/dist/cpsat/rules/max-consecutive-days.js +16 -2
- package/dist/cpsat/rules/max-consecutive-days.js.map +1 -1
- package/dist/cpsat/rules/max-days-week.d.ts +44 -0
- package/dist/cpsat/rules/max-days-week.d.ts.map +1 -0
- package/dist/cpsat/rules/max-days-week.js +95 -0
- package/dist/cpsat/rules/max-days-week.js.map +1 -0
- package/dist/cpsat/rules/max-hours-day.d.ts.map +1 -1
- package/dist/cpsat/rules/max-hours-day.js +15 -2
- package/dist/cpsat/rules/max-hours-day.js.map +1 -1
- package/dist/cpsat/rules/max-hours-week.d.ts.map +1 -1
- package/dist/cpsat/rules/max-hours-week.js +16 -2
- package/dist/cpsat/rules/max-hours-week.js.map +1 -1
- package/dist/cpsat/rules/max-shifts-day.d.ts.map +1 -1
- package/dist/cpsat/rules/max-shifts-day.js +15 -2
- package/dist/cpsat/rules/max-shifts-day.js.map +1 -1
- package/dist/cpsat/rules/min-consecutive-days.d.ts.map +1 -1
- package/dist/cpsat/rules/min-consecutive-days.js +15 -2
- package/dist/cpsat/rules/min-consecutive-days.js.map +1 -1
- package/dist/cpsat/rules/min-days-week.d.ts +34 -0
- package/dist/cpsat/rules/min-days-week.d.ts.map +1 -0
- package/dist/cpsat/rules/min-days-week.js +84 -0
- package/dist/cpsat/rules/min-days-week.js.map +1 -0
- package/dist/cpsat/rules/min-hours-day.d.ts.map +1 -1
- package/dist/cpsat/rules/min-hours-day.js +15 -2
- package/dist/cpsat/rules/min-hours-day.js.map +1 -1
- package/dist/cpsat/rules/min-hours-week.d.ts.map +1 -1
- package/dist/cpsat/rules/min-hours-week.js +16 -2
- package/dist/cpsat/rules/min-hours-week.js.map +1 -1
- package/dist/cpsat/rules/min-rest-between-shifts.d.ts.map +1 -1
- package/dist/cpsat/rules/min-rest-between-shifts.js +72 -2
- package/dist/cpsat/rules/min-rest-between-shifts.js.map +1 -1
- package/dist/cpsat/rules/minimize-cost.d.ts.map +1 -1
- package/dist/cpsat/rules/minimize-cost.js +2 -23
- package/dist/cpsat/rules/minimize-cost.js.map +1 -1
- package/dist/cpsat/rules/must-assign.d.ts +49 -0
- package/dist/cpsat/rules/must-assign.d.ts.map +1 -0
- package/dist/cpsat/rules/must-assign.js +86 -0
- package/dist/cpsat/rules/must-assign.js.map +1 -0
- package/dist/cpsat/rules/overtime-daily-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-daily-multiplier.js +1 -12
- package/dist/cpsat/rules/overtime-daily-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-daily-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-daily-surcharge.js +1 -5
- package/dist/cpsat/rules/overtime-daily-surcharge.js.map +1 -1
- package/dist/cpsat/rules/overtime-tiered-multiplier.d.ts +5 -1
- package/dist/cpsat/rules/overtime-tiered-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-tiered-multiplier.js +1 -12
- package/dist/cpsat/rules/overtime-tiered-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-multiplier.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-multiplier.js +1 -12
- package/dist/cpsat/rules/overtime-weekly-multiplier.js.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/overtime-weekly-surcharge.js +1 -5
- package/dist/cpsat/rules/overtime-weekly-surcharge.js.map +1 -1
- package/dist/cpsat/rules/registry.d.ts +28 -2
- package/dist/cpsat/rules/registry.d.ts.map +1 -1
- package/dist/cpsat/rules/registry.js +4 -1
- package/dist/cpsat/rules/registry.js.map +1 -1
- package/dist/cpsat/rules/resolver.js +2 -2
- package/dist/cpsat/rules/resolver.js.map +1 -1
- package/dist/cpsat/rules/rules.types.d.ts +3 -0
- package/dist/cpsat/rules/rules.types.d.ts.map +1 -1
- package/dist/cpsat/rules/scope.types.d.ts +18 -1
- package/dist/cpsat/rules/scope.types.d.ts.map +1 -1
- package/dist/cpsat/rules/scope.types.js +59 -16
- package/dist/cpsat/rules/scope.types.js.map +1 -1
- package/dist/cpsat/rules/time-cost-surcharge.d.ts.map +1 -1
- package/dist/cpsat/rules/time-cost-surcharge.js +2 -1
- package/dist/cpsat/rules/time-cost-surcharge.js.map +1 -1
- package/dist/cpsat/rules/time-off.d.ts.map +1 -1
- package/dist/cpsat/rules/time-off.js +6 -3
- package/dist/cpsat/rules/time-off.js.map +1 -1
- package/dist/cpsat/semantic-time.d.ts +44 -42
- package/dist/cpsat/semantic-time.d.ts.map +1 -1
- package/dist/cpsat/semantic-time.js +64 -46
- package/dist/cpsat/semantic-time.js.map +1 -1
- package/dist/cpsat/types.d.ts +37 -27
- package/dist/cpsat/types.d.ts.map +1 -1
- package/dist/cpsat/utils.d.ts.map +1 -1
- package/dist/cpsat/utils.js +7 -12
- package/dist/cpsat/utils.js.map +1 -1
- package/dist/cpsat/validation-reporter.d.ts +10 -7
- package/dist/cpsat/validation-reporter.d.ts.map +1 -1
- package/dist/cpsat/validation-reporter.js +44 -72
- package/dist/cpsat/validation-reporter.js.map +1 -1
- package/dist/cpsat/validation.types.d.ts +54 -44
- package/dist/cpsat/validation.types.d.ts.map +1 -1
- package/dist/cpsat/validation.types.js +15 -10
- package/dist/cpsat/validation.types.js.map +1 -1
- package/dist/datetime.utils.d.ts +3 -203
- package/dist/datetime.utils.d.ts.map +1 -1
- package/dist/datetime.utils.js +1 -288
- package/dist/datetime.utils.js.map +1 -1
- package/dist/index.d.ts +14 -83
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -83
- package/dist/index.js.map +1 -1
- package/dist/schedule/cost.d.ts +204 -0
- package/dist/schedule/cost.d.ts.map +1 -0
- package/dist/schedule/cost.js +187 -0
- package/dist/schedule/cost.js.map +1 -0
- package/dist/schedule/coverage.d.ts +85 -0
- package/dist/schedule/coverage.d.ts.map +1 -0
- package/dist/schedule/coverage.js +33 -0
- package/dist/schedule/coverage.js.map +1 -0
- package/dist/schedule/definition.d.ts +227 -0
- package/dist/schedule/definition.d.ts.map +1 -0
- package/dist/schedule/definition.js +659 -0
- package/dist/schedule/definition.js.map +1 -0
- package/dist/schedule/index.d.ts +67 -0
- package/dist/schedule/index.d.ts.map +1 -0
- package/dist/schedule/index.js +69 -0
- package/dist/schedule/index.js.map +1 -0
- package/dist/schedule/rules.d.ts +353 -0
- package/dist/schedule/rules.d.ts.map +1 -0
- package/dist/schedule/rules.js +352 -0
- package/dist/schedule/rules.js.map +1 -0
- package/dist/schedule/shift-patterns.d.ts +34 -0
- package/dist/schedule/shift-patterns.d.ts.map +1 -0
- package/dist/schedule/shift-patterns.js +41 -0
- package/dist/schedule/shift-patterns.js.map +1 -0
- package/dist/schedule/time-periods.d.ts +69 -0
- package/dist/schedule/time-periods.d.ts.map +1 -0
- package/dist/schedule/time-periods.js +91 -0
- package/dist/schedule/time-periods.js.map +1 -0
- package/dist/types.d.ts +14 -78
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/package.json +4 -9
- package/solver/src/solver/app.py +1 -1
- package/solver/src/solver/solver.py +7 -4
- package/src/client.ts +6 -8
- package/src/client.types.ts +9 -0
- package/src/cpsat/model-builder.ts +44 -35
- package/src/cpsat/response.ts +13 -1
- package/src/cpsat/rules/cost-utils.ts +25 -0
- package/src/cpsat/rules/day-cost-multiplier.ts +3 -14
- package/src/cpsat/rules/day-cost-surcharge.ts +3 -8
- package/src/cpsat/rules/index.ts +3 -0
- package/src/cpsat/rules/max-consecutive-days.ts +17 -0
- package/src/cpsat/rules/max-days-week.ts +143 -0
- package/src/cpsat/rules/max-hours-day.ts +21 -1
- package/src/cpsat/rules/max-hours-week.ts +22 -1
- package/src/cpsat/rules/max-shifts-day.ts +21 -1
- package/src/cpsat/rules/min-consecutive-days.ts +16 -1
- package/src/cpsat/rules/min-days-week.ts +120 -0
- package/src/cpsat/rules/min-hours-day.ts +16 -1
- package/src/cpsat/rules/min-hours-week.ts +17 -1
- package/src/cpsat/rules/min-rest-between-shifts.ts +92 -2
- package/src/cpsat/rules/minimize-cost.ts +2 -29
- package/src/cpsat/rules/must-assign.ts +108 -0
- package/src/cpsat/rules/overtime-daily-multiplier.ts +1 -12
- package/src/cpsat/rules/overtime-daily-surcharge.ts +1 -6
- package/src/cpsat/rules/overtime-tiered-multiplier.ts +6 -13
- package/src/cpsat/rules/overtime-weekly-multiplier.ts +1 -12
- package/src/cpsat/rules/overtime-weekly-surcharge.ts +1 -6
- package/src/cpsat/rules/registry.ts +8 -2
- package/src/cpsat/rules/resolver.ts +2 -2
- package/src/cpsat/rules/rules.types.ts +3 -0
- package/src/cpsat/rules/scope.types.ts +73 -20
- package/src/cpsat/rules/time-cost-surcharge.ts +2 -1
- package/src/cpsat/rules/time-off.ts +6 -2
- package/src/cpsat/semantic-time.ts +115 -91
- package/src/cpsat/types.ts +37 -27
- package/src/cpsat/utils.ts +8 -12
- package/src/cpsat/validation-reporter.ts +51 -82
- package/src/cpsat/validation.types.ts +72 -47
- package/src/datetime.utils.ts +3 -334
- package/src/index.ts +35 -107
- package/src/schedule/cost.ts +242 -0
- package/src/schedule/coverage.ts +135 -0
- package/src/schedule/definition.ts +958 -0
- package/src/schedule/index.ts +112 -0
- package/src/schedule/rules.ts +529 -0
- package/src/schedule/shift-patterns.ts +46 -0
- package/src/schedule/time-periods.ts +110 -0
- package/src/types.ts +14 -88
- package/dist/errors.d.ts +0 -12
- package/dist/errors.d.ts.map +0 -1
- package/dist/errors.js +0 -17
- package/dist/errors.js.map +0 -1
- package/dist/llms.d.ts +0 -2
- package/dist/llms.d.ts.map +0 -1
- package/dist/llms.js +0 -3
- package/dist/llms.js.map +0 -1
- package/dist/schedule.d.ts +0 -724
- package/dist/schedule.d.ts.map +0 -1
- package/dist/schedule.js +0 -899
- package/dist/schedule.js.map +0 -1
- package/dist/validation.d.ts +0 -105
- package/dist/validation.d.ts.map +0 -1
- package/dist/validation.js +0 -130
- package/dist/validation.js.map +0 -1
- package/llms.txt +0 -925
- package/src/errors.ts +0 -17
- package/src/llms.ts +0 -3
- package/src/schedule.ts +0 -1419
- package/src/validation.ts +0 -188
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import * as z from "zod";
|
|
2
|
+
import { DayOfWeekSchema } from "../../types.js";
|
|
3
|
+
import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
|
|
4
|
+
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, ruleGroup, } from "./scope.types.js";
|
|
5
|
+
const MaxDaysWeekBase = z.object({
|
|
6
|
+
days: z.number().int().min(0),
|
|
7
|
+
priority: PrioritySchema,
|
|
8
|
+
weekStartsOn: DayOfWeekSchema.optional(),
|
|
9
|
+
});
|
|
10
|
+
const MaxDaysWeekSchema = MaxDaysWeekBase.and(entityScope(["members", "roles", "skills"])).and(timeScope(["dateRange", "specificDates", "dayOfWeek", "recurring"]));
|
|
11
|
+
/**
|
|
12
|
+
* Caps total number of days a person can work within each scheduling week.
|
|
13
|
+
*
|
|
14
|
+
* @remarks
|
|
15
|
+
* Creates a binary "works on day" variable for each member and day, then
|
|
16
|
+
* constrains the weekly sum. This counts distinct days, regardless of how
|
|
17
|
+
* many shifts are assigned on a single day.
|
|
18
|
+
*
|
|
19
|
+
* @param config - See {@link MaxDaysWeekConfig}
|
|
20
|
+
* @example Limit everyone to 5 days per week
|
|
21
|
+
* ```ts
|
|
22
|
+
* createMaxDaysWeekRule({ days: 5, priority: "MANDATORY" });
|
|
23
|
+
* ```
|
|
24
|
+
*
|
|
25
|
+
* @example Part-time staff limited to 3 days
|
|
26
|
+
* ```ts
|
|
27
|
+
* createMaxDaysWeekRule({
|
|
28
|
+
* roleIds: ["part-time"],
|
|
29
|
+
* days: 3,
|
|
30
|
+
* priority: "HIGH",
|
|
31
|
+
* });
|
|
32
|
+
* ```
|
|
33
|
+
*/
|
|
34
|
+
export function createMaxDaysWeekRule(config) {
|
|
35
|
+
const parsed = MaxDaysWeekSchema.parse(config);
|
|
36
|
+
const entityScopeValue = parseEntityScope(parsed);
|
|
37
|
+
const timeScopeValue = parseTimeScope(parsed);
|
|
38
|
+
const { days, priority, weekStartsOn } = parsed;
|
|
39
|
+
const group = ruleGroup(`max-days-week:${days}`, `Max ${days}d per week`, entityScopeValue, timeScopeValue);
|
|
40
|
+
return {
|
|
41
|
+
compile(b) {
|
|
42
|
+
const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
|
|
43
|
+
const activeDays = resolveActiveDaysFromScope(timeScopeValue, b.days);
|
|
44
|
+
if (targetMembers.length === 0 || activeDays.length === 0)
|
|
45
|
+
return;
|
|
46
|
+
const weeks = splitIntoWeeks(activeDays, weekStartsOn ?? b.weekStartsOn);
|
|
47
|
+
for (const emp of targetMembers) {
|
|
48
|
+
for (const weekDays of weeks) {
|
|
49
|
+
const weekWorkVars = [];
|
|
50
|
+
for (const day of weekDays) {
|
|
51
|
+
const dayAssignments = b.shiftPatterns
|
|
52
|
+
.filter((p) => b.canAssign(emp, p) && b.patternAvailableOnDay(p, day))
|
|
53
|
+
.map((p) => b.assignment(emp.id, p.id, day));
|
|
54
|
+
if (dayAssignments.length === 0)
|
|
55
|
+
continue;
|
|
56
|
+
const worksVar = b.boolVar(`works_day_${emp.id}_${day}`);
|
|
57
|
+
weekWorkVars.push(worksVar);
|
|
58
|
+
// worksVar >= each assignment (if any assignment is 1, worksVar must be 1)
|
|
59
|
+
for (const assignVar of dayAssignments) {
|
|
60
|
+
b.addLinear([
|
|
61
|
+
{ var: worksVar, coeff: 1 },
|
|
62
|
+
{ var: assignVar, coeff: -1 },
|
|
63
|
+
], ">=", 0);
|
|
64
|
+
}
|
|
65
|
+
// worksVar <= sum(assignments) (if no assignment is 1, worksVar must be 0)
|
|
66
|
+
b.addLinear([{ var: worksVar, coeff: 1 }, ...dayAssignments.map((v) => ({ var: v, coeff: -1 }))], "<=", 0);
|
|
67
|
+
}
|
|
68
|
+
if (weekWorkVars.length === 0)
|
|
69
|
+
continue;
|
|
70
|
+
const weekLabel = weekDays[0];
|
|
71
|
+
const constraintId = `max-days-week:${emp.id}:${weekLabel}`;
|
|
72
|
+
const terms = weekWorkVars.map((v) => ({ var: v, coeff: 1 }));
|
|
73
|
+
if (priority === "MANDATORY") {
|
|
74
|
+
b.addLinear(terms, "<=", days);
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
b.addSoftLinear(terms, "<=", days, priorityToPenalty(priority), constraintId);
|
|
78
|
+
b.reporter.trackConstraint({
|
|
79
|
+
id: constraintId,
|
|
80
|
+
type: "rule",
|
|
81
|
+
rule: "max-days-week",
|
|
82
|
+
description: `${emp.id} max ${days}d in week starting ${weekLabel}`,
|
|
83
|
+
targetValue: days,
|
|
84
|
+
comparator: "<=",
|
|
85
|
+
day: weekLabel,
|
|
86
|
+
context: { memberIds: [emp.id], days: weekDays },
|
|
87
|
+
group,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
},
|
|
93
|
+
};
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=max-days-week.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"max-days-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-days-week.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,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;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAc3D,QAAA,MAAM,iBAAiB;;;mfAMoD,CAAC;AAE5E;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAwDhF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { priorityToPenalty } from "../utils.js";
|
|
3
|
-
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, } from "./scope.types.js";
|
|
3
|
+
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, ruleGroup, } from "./scope.types.js";
|
|
4
4
|
const MaxHoursDaySchema = z
|
|
5
5
|
.object({
|
|
6
6
|
hours: z.number().min(0),
|
|
@@ -36,6 +36,7 @@ export function createMaxHoursDayRule(config) {
|
|
|
36
36
|
const timeScopeValue = parseTimeScope(parsed);
|
|
37
37
|
const { hours, priority } = parsed;
|
|
38
38
|
const maxMinutes = hours * 60;
|
|
39
|
+
const group = ruleGroup(`max-hours-day:${hours}`, `Max ${hours}h per day`, entityScopeValue, timeScopeValue);
|
|
39
40
|
return {
|
|
40
41
|
compile(b) {
|
|
41
42
|
const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
|
|
@@ -57,11 +58,23 @@ export function createMaxHoursDayRule(config) {
|
|
|
57
58
|
}
|
|
58
59
|
if (terms.length === 0)
|
|
59
60
|
continue;
|
|
61
|
+
const constraintId = `max-hours-day:${emp.id}:${day}`;
|
|
60
62
|
if (priority === "MANDATORY") {
|
|
61
63
|
b.addLinear(terms, "<=", maxMinutes);
|
|
62
64
|
}
|
|
63
65
|
else {
|
|
64
|
-
b.addSoftLinear(terms, "<=", maxMinutes, priorityToPenalty(priority));
|
|
66
|
+
b.addSoftLinear(terms, "<=", maxMinutes, priorityToPenalty(priority), constraintId);
|
|
67
|
+
b.reporter.trackConstraint({
|
|
68
|
+
id: constraintId,
|
|
69
|
+
type: "rule",
|
|
70
|
+
rule: "max-hours-day",
|
|
71
|
+
description: `${emp.id} max ${hours}h on ${day}`,
|
|
72
|
+
targetValue: maxMinutes,
|
|
73
|
+
comparator: "<=",
|
|
74
|
+
day,
|
|
75
|
+
context: { memberIds: [emp.id], days: [day] },
|
|
76
|
+
group,
|
|
77
|
+
});
|
|
65
78
|
}
|
|
66
79
|
}
|
|
67
80
|
}
|
|
@@ -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;AAGzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,cAAc,EACd,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"max-hours-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-day.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,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;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAoB3D,QAAA,MAAM,kBAAkB;;;;mfAEvB,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,eAAe,CA6DlF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { DayOfWeekSchema } from "../../types.js";
|
|
3
3
|
import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
|
|
4
|
-
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, } from "./scope.types.js";
|
|
4
|
+
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, ruleGroup, } from "./scope.types.js";
|
|
5
5
|
const MaxHoursWeekBase = z.object({
|
|
6
6
|
hours: z.number().min(0),
|
|
7
7
|
priority: PrioritySchema,
|
|
@@ -35,6 +35,7 @@ export function createMaxHoursWeekRule(config) {
|
|
|
35
35
|
const timeScopeValue = parseTimeScope(parsed);
|
|
36
36
|
const { hours, priority, weekStartsOn } = parsed;
|
|
37
37
|
const maxMinutes = hours * 60;
|
|
38
|
+
const group = ruleGroup(`max-hours-week:${hours}`, `Max ${hours}h per week`, entityScopeValue, timeScopeValue);
|
|
38
39
|
return {
|
|
39
40
|
compile(b) {
|
|
40
41
|
const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
|
|
@@ -59,11 +60,24 @@ export function createMaxHoursWeekRule(config) {
|
|
|
59
60
|
}
|
|
60
61
|
if (terms.length === 0)
|
|
61
62
|
continue;
|
|
63
|
+
const weekLabel = weekDays[0];
|
|
64
|
+
const constraintId = `max-hours-week:${emp.id}:${weekLabel}`;
|
|
62
65
|
if (priority === "MANDATORY") {
|
|
63
66
|
b.addLinear(terms, "<=", maxMinutes);
|
|
64
67
|
}
|
|
65
68
|
else {
|
|
66
|
-
b.addSoftLinear(terms, "<=", maxMinutes, priorityToPenalty(priority));
|
|
69
|
+
b.addSoftLinear(terms, "<=", maxMinutes, priorityToPenalty(priority), constraintId);
|
|
70
|
+
b.reporter.trackConstraint({
|
|
71
|
+
id: constraintId,
|
|
72
|
+
type: "rule",
|
|
73
|
+
rule: "max-hours-week",
|
|
74
|
+
description: `${emp.id} max ${hours}h in week starting ${weekLabel}`,
|
|
75
|
+
targetValue: maxMinutes,
|
|
76
|
+
comparator: "<=",
|
|
77
|
+
day: weekLabel,
|
|
78
|
+
context: { memberIds: [emp.id], days: weekDays },
|
|
79
|
+
group,
|
|
80
|
+
});
|
|
67
81
|
}
|
|
68
82
|
}
|
|
69
83
|
}
|
|
@@ -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;AAGjD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EACL,cAAc,EACd,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"max-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-hours-week.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,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;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAc3D,QAAA,MAAM,kBAAkB;;;mfAMmD,CAAC;AAE5E;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,eAAe,CAuDlF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { priorityToPenalty } from "../utils.js";
|
|
3
|
-
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, } from "./scope.types.js";
|
|
3
|
+
import { PrioritySchema, entityScope, timeScope, parseEntityScope, parseTimeScope, resolveMembersFromScope, resolveActiveDaysFromScope, ruleGroup, } from "./scope.types.js";
|
|
4
4
|
const MaxShiftsDaySchema = z
|
|
5
5
|
.object({
|
|
6
6
|
shifts: z.number().int().min(1),
|
|
@@ -38,6 +38,7 @@ export function createMaxShiftsDayRule(config) {
|
|
|
38
38
|
const entityScopeValue = parseEntityScope(parsed);
|
|
39
39
|
const timeScopeValue = parseTimeScope(parsed);
|
|
40
40
|
const { shifts, priority } = parsed;
|
|
41
|
+
const group = ruleGroup(`max-shifts-day:${shifts}`, `Max ${shifts} shift${shifts === 1 ? "" : "s"} per day`, entityScopeValue, timeScopeValue);
|
|
41
42
|
return {
|
|
42
43
|
compile(b) {
|
|
43
44
|
const targetMembers = resolveMembersFromScope(entityScopeValue, b.members);
|
|
@@ -59,11 +60,23 @@ export function createMaxShiftsDayRule(config) {
|
|
|
59
60
|
}
|
|
60
61
|
if (terms.length === 0)
|
|
61
62
|
continue;
|
|
63
|
+
const constraintId = `max-shifts-day:${emp.id}:${day}`;
|
|
62
64
|
if (priority === "MANDATORY") {
|
|
63
65
|
b.addLinear(terms, "<=", shifts);
|
|
64
66
|
}
|
|
65
67
|
else {
|
|
66
|
-
b.addSoftLinear(terms, "<=", shifts, priorityToPenalty(priority));
|
|
68
|
+
b.addSoftLinear(terms, "<=", shifts, priorityToPenalty(priority), constraintId);
|
|
69
|
+
b.reporter.trackConstraint({
|
|
70
|
+
id: constraintId,
|
|
71
|
+
type: "rule",
|
|
72
|
+
rule: "max-shifts-day",
|
|
73
|
+
description: `${emp.id} max ${shifts} shift${shifts === 1 ? "" : "s"} on ${day}`,
|
|
74
|
+
targetValue: shifts,
|
|
75
|
+
comparator: "<=",
|
|
76
|
+
day,
|
|
77
|
+
context: { memberIds: [emp.id], days: [day] },
|
|
78
|
+
group,
|
|
79
|
+
});
|
|
67
80
|
}
|
|
68
81
|
}
|
|
69
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"max-shifts-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-shifts-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,cAAc,EACd,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACvB,0BAA0B,
|
|
1
|
+
{"version":3,"file":"max-shifts-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/max-shifts-day.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-consecutive-days.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-consecutive-days.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"min-consecutive-days.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-consecutive-days.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAU3D,QAAA,MAAM,wBAAwB;;;iOAKqB,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,wBAAwB,CAAC,CAAC;AAEhF;;;;;;;;;GASG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,wBAAwB,GAAG,eAAe,CAwH9F"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { priorityToPenalty } from "../utils.js";
|
|
3
|
-
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, } from "./scope.types.js";
|
|
3
|
+
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
|
|
4
4
|
const MinConsecutiveDaysSchema = z
|
|
5
5
|
.object({
|
|
6
6
|
days: z.number().min(0),
|
|
@@ -21,6 +21,7 @@ export function createMinConsecutiveDaysRule(config) {
|
|
|
21
21
|
const parsed = MinConsecutiveDaysSchema.parse(config);
|
|
22
22
|
const scope = parseEntityScope(parsed);
|
|
23
23
|
const { days, priority } = parsed;
|
|
24
|
+
const group = ruleGroup(`min-consecutive-days:${days}`, `Min ${days} consecutive days`, scope);
|
|
24
25
|
return {
|
|
25
26
|
compile(b) {
|
|
26
27
|
if (days <= 1)
|
|
@@ -84,11 +85,23 @@ export function createMinConsecutiveDaysRule(config) {
|
|
|
84
85
|
...window.map((v) => ({ var: v, coeff: 1 })),
|
|
85
86
|
{ var: startVar, coeff: -days },
|
|
86
87
|
];
|
|
88
|
+
const constraintId = `min-consecutive-days:${emp.id}:${dayLabel}`;
|
|
87
89
|
if (priority === "MANDATORY") {
|
|
88
90
|
b.addLinear(terms, ">=", 0);
|
|
89
91
|
}
|
|
90
92
|
else {
|
|
91
|
-
b.addSoftLinear(terms, ">=", 0, priorityToPenalty(priority));
|
|
93
|
+
b.addSoftLinear(terms, ">=", 0, priorityToPenalty(priority), constraintId);
|
|
94
|
+
b.reporter.trackConstraint({
|
|
95
|
+
id: constraintId,
|
|
96
|
+
type: "rule",
|
|
97
|
+
rule: "min-consecutive-days",
|
|
98
|
+
description: `${emp.id} min ${days} consecutive days from ${dayLabel}`,
|
|
99
|
+
targetValue: 0,
|
|
100
|
+
comparator: ">=",
|
|
101
|
+
day: dayLabel,
|
|
102
|
+
context: { memberIds: [emp.id], days: b.days.slice(i, i + days) },
|
|
103
|
+
group,
|
|
104
|
+
});
|
|
92
105
|
}
|
|
93
106
|
}
|
|
94
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-consecutive-days.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-consecutive-days.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"min-consecutive-days.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-consecutive-days.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import * as z from "zod";
|
|
2
|
+
import type { CompilationRule } from "../model-builder.js";
|
|
3
|
+
declare const MinDaysWeekSchema: z.ZodIntersection<z.ZodObject<{
|
|
4
|
+
days: z.ZodNumber;
|
|
5
|
+
priority: z.ZodDefault<z.ZodUnion<readonly [z.ZodLiteral<"LOW">, z.ZodLiteral<"MEDIUM">, z.ZodLiteral<"HIGH">, z.ZodLiteral<"MANDATORY">]>>;
|
|
6
|
+
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
|
+
}, 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>>>;
|
|
8
|
+
/**
|
|
9
|
+
* Configuration for {@link createMinDaysWeekRule}.
|
|
10
|
+
*
|
|
11
|
+
* - `days` (required): minimum number of days required 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
|
+
*/
|
|
17
|
+
export type MinDaysWeekConfig = z.infer<typeof MinDaysWeekSchema>;
|
|
18
|
+
/**
|
|
19
|
+
* Enforces a minimum number of days a person must work per scheduling week.
|
|
20
|
+
*
|
|
21
|
+
* @remarks
|
|
22
|
+
* Creates a binary "works on day" variable for each member and day, then
|
|
23
|
+
* constrains the weekly sum. This counts distinct days, regardless of how
|
|
24
|
+
* many shifts are assigned on a single day.
|
|
25
|
+
*
|
|
26
|
+
* @param config - See {@link MinDaysWeekConfig}
|
|
27
|
+
* @example
|
|
28
|
+
* ```ts
|
|
29
|
+
* createMinDaysWeekRule({ days: 3, priority: "HIGH" });
|
|
30
|
+
* ```
|
|
31
|
+
*/
|
|
32
|
+
export declare function createMinDaysWeekRule(config: MinDaysWeekConfig): CompilationRule;
|
|
33
|
+
export {};
|
|
34
|
+
//# sourceMappingURL=min-days-week.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"min-days-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB3D,QAAA,MAAM,iBAAiB;;;;iOAAmE,CAAC;AAE3F;;;;;;;;GAQG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAyEhF"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import * as z from "zod";
|
|
2
|
+
import { DayOfWeekSchema } from "../../types.js";
|
|
3
|
+
import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
|
|
4
|
+
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
|
|
5
|
+
const MinDaysWeekBase = z.object({
|
|
6
|
+
days: z.number().int().min(0),
|
|
7
|
+
priority: PrioritySchema,
|
|
8
|
+
weekStartsOn: DayOfWeekSchema.optional(),
|
|
9
|
+
});
|
|
10
|
+
const MinDaysWeekSchema = MinDaysWeekBase.and(entityScope(["members", "roles", "skills"]));
|
|
11
|
+
/**
|
|
12
|
+
* Enforces a minimum number of days a person must work per scheduling week.
|
|
13
|
+
*
|
|
14
|
+
* @remarks
|
|
15
|
+
* Creates a binary "works on day" variable for each member and day, then
|
|
16
|
+
* constrains the weekly sum. This counts distinct days, regardless of how
|
|
17
|
+
* many shifts are assigned on a single day.
|
|
18
|
+
*
|
|
19
|
+
* @param config - See {@link MinDaysWeekConfig}
|
|
20
|
+
* @example
|
|
21
|
+
* ```ts
|
|
22
|
+
* createMinDaysWeekRule({ days: 3, priority: "HIGH" });
|
|
23
|
+
* ```
|
|
24
|
+
*/
|
|
25
|
+
export function createMinDaysWeekRule(config) {
|
|
26
|
+
const parsed = MinDaysWeekSchema.parse(config);
|
|
27
|
+
const scope = parseEntityScope(parsed);
|
|
28
|
+
const { days, priority, weekStartsOn } = parsed;
|
|
29
|
+
const group = ruleGroup(`min-days-week:${days}`, `Min ${days}d per week`, scope);
|
|
30
|
+
return {
|
|
31
|
+
compile(b) {
|
|
32
|
+
if (days <= 0)
|
|
33
|
+
return;
|
|
34
|
+
const members = resolveMembersFromScope(scope, b.members);
|
|
35
|
+
const weeks = splitIntoWeeks(b.days, weekStartsOn ?? b.weekStartsOn);
|
|
36
|
+
for (const emp of members) {
|
|
37
|
+
for (const weekDays of weeks) {
|
|
38
|
+
const weekWorkVars = [];
|
|
39
|
+
for (const day of weekDays) {
|
|
40
|
+
const dayAssignments = b.shiftPatterns
|
|
41
|
+
.filter((p) => b.canAssign(emp, p) && b.patternAvailableOnDay(p, day))
|
|
42
|
+
.map((p) => b.assignment(emp.id, p.id, day));
|
|
43
|
+
if (dayAssignments.length === 0)
|
|
44
|
+
continue;
|
|
45
|
+
const worksVar = b.boolVar(`works_day_${emp.id}_${day}`);
|
|
46
|
+
weekWorkVars.push(worksVar);
|
|
47
|
+
// worksVar >= each assignment (if any assignment is 1, worksVar must be 1)
|
|
48
|
+
for (const assignVar of dayAssignments) {
|
|
49
|
+
b.addLinear([
|
|
50
|
+
{ var: worksVar, coeff: 1 },
|
|
51
|
+
{ var: assignVar, coeff: -1 },
|
|
52
|
+
], ">=", 0);
|
|
53
|
+
}
|
|
54
|
+
// worksVar <= sum(assignments) (if no assignment is 1, worksVar must be 0)
|
|
55
|
+
b.addLinear([{ var: worksVar, coeff: 1 }, ...dayAssignments.map((v) => ({ var: v, coeff: -1 }))], "<=", 0);
|
|
56
|
+
}
|
|
57
|
+
if (weekWorkVars.length === 0)
|
|
58
|
+
continue;
|
|
59
|
+
const weekLabel = weekDays[0];
|
|
60
|
+
const constraintId = `min-days-week:${emp.id}:${weekLabel}`;
|
|
61
|
+
const terms = weekWorkVars.map((v) => ({ var: v, coeff: 1 }));
|
|
62
|
+
if (priority === "MANDATORY") {
|
|
63
|
+
b.addLinear(terms, ">=", days);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
b.addSoftLinear(terms, ">=", days, priorityToPenalty(priority), constraintId);
|
|
67
|
+
b.reporter.trackConstraint({
|
|
68
|
+
id: constraintId,
|
|
69
|
+
type: "rule",
|
|
70
|
+
rule: "min-days-week",
|
|
71
|
+
description: `${emp.id} min ${days}d in week starting ${weekLabel}`,
|
|
72
|
+
targetValue: days,
|
|
73
|
+
comparator: ">=",
|
|
74
|
+
day: weekLabel,
|
|
75
|
+
context: { memberIds: [emp.id], days: weekDays },
|
|
76
|
+
group,
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
},
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=min-days-week.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"min-days-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-days-week.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"min-hours-day.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAW3D,QAAA,MAAM,iBAAiB;;;iOAK4B,CAAC;AAEpD;;;;;;;GAOG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAElE;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,iBAAiB,GAAG,eAAe,CAiDhF"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { priorityToPenalty } from "../utils.js";
|
|
3
|
-
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, } from "./scope.types.js";
|
|
3
|
+
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
|
|
4
4
|
const MinHoursDaySchema = z
|
|
5
5
|
.object({
|
|
6
6
|
hours: z.number().min(0),
|
|
@@ -21,6 +21,7 @@ export function createMinHoursDayRule(config) {
|
|
|
21
21
|
const scope = parseEntityScope(parsed);
|
|
22
22
|
const { hours, priority } = parsed;
|
|
23
23
|
const minMinutes = hours * 60;
|
|
24
|
+
const group = ruleGroup(`min-hours-day:${hours}`, `Min ${hours}h per day`, scope);
|
|
24
25
|
return {
|
|
25
26
|
compile(b) {
|
|
26
27
|
if (hours <= 0)
|
|
@@ -41,11 +42,23 @@ export function createMinHoursDayRule(config) {
|
|
|
41
42
|
}
|
|
42
43
|
if (terms.length === 0)
|
|
43
44
|
continue;
|
|
45
|
+
const constraintId = `min-hours-day:${emp.id}:${day}`;
|
|
44
46
|
if (priority === "MANDATORY") {
|
|
45
47
|
b.addLinear(terms, ">=", minMinutes);
|
|
46
48
|
}
|
|
47
49
|
else {
|
|
48
|
-
b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority));
|
|
50
|
+
b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority), constraintId);
|
|
51
|
+
b.reporter.trackConstraint({
|
|
52
|
+
id: constraintId,
|
|
53
|
+
type: "rule",
|
|
54
|
+
rule: "min-hours-day",
|
|
55
|
+
description: `${emp.id} min ${hours}h on ${day}`,
|
|
56
|
+
targetValue: minMinutes,
|
|
57
|
+
comparator: ">=",
|
|
58
|
+
day,
|
|
59
|
+
context: { memberIds: [emp.id], days: [day] },
|
|
60
|
+
group,
|
|
61
|
+
});
|
|
49
62
|
}
|
|
50
63
|
}
|
|
51
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-hours-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAGzB,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"min-hours-day.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-day.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"min-hours-week.d.ts","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AAEzB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB3D,QAAA,MAAM,kBAAkB;;;;iOAAoE,CAAC;AAE7F;;;;;;;;GAQG;AACH,MAAM,MAAM,kBAAkB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,kBAAkB,CAAC,CAAC;AAEpE;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,eAAe,CAqDlF"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as z from "zod";
|
|
2
2
|
import { DayOfWeekSchema } from "../../types.js";
|
|
3
3
|
import { priorityToPenalty, splitIntoWeeks } from "../utils.js";
|
|
4
|
-
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, } from "./scope.types.js";
|
|
4
|
+
import { PrioritySchema, entityScope, parseEntityScope, resolveMembersFromScope, ruleGroup, } from "./scope.types.js";
|
|
5
5
|
const MinHoursWeekBase = z.object({
|
|
6
6
|
hours: z.number().min(0),
|
|
7
7
|
priority: PrioritySchema,
|
|
@@ -22,6 +22,7 @@ export function createMinHoursWeekRule(config) {
|
|
|
22
22
|
const scope = parseEntityScope(parsed);
|
|
23
23
|
const { hours, priority, weekStartsOn } = parsed;
|
|
24
24
|
const minMinutes = hours * 60;
|
|
25
|
+
const group = ruleGroup(`min-hours-week:${hours}`, `Min ${hours}h per week`, scope);
|
|
25
26
|
return {
|
|
26
27
|
compile(b) {
|
|
27
28
|
if (hours <= 0)
|
|
@@ -45,11 +46,24 @@ export function createMinHoursWeekRule(config) {
|
|
|
45
46
|
}
|
|
46
47
|
if (terms.length === 0)
|
|
47
48
|
continue;
|
|
49
|
+
const weekLabel = weekDays[0];
|
|
50
|
+
const constraintId = `min-hours-week:${emp.id}:${weekLabel}`;
|
|
48
51
|
if (priority === "MANDATORY") {
|
|
49
52
|
b.addLinear(terms, ">=", minMinutes);
|
|
50
53
|
}
|
|
51
54
|
else {
|
|
52
|
-
b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority));
|
|
55
|
+
b.addSoftLinear(terms, ">=", minMinutes, priorityToPenalty(priority), constraintId);
|
|
56
|
+
b.reporter.trackConstraint({
|
|
57
|
+
id: constraintId,
|
|
58
|
+
type: "rule",
|
|
59
|
+
rule: "min-hours-week",
|
|
60
|
+
description: `${emp.id} min ${hours}h in week starting ${weekLabel}`,
|
|
61
|
+
targetValue: minMinutes,
|
|
62
|
+
comparator: ">=",
|
|
63
|
+
day: weekLabel,
|
|
64
|
+
context: { memberIds: [emp.id], days: weekDays },
|
|
65
|
+
group,
|
|
66
|
+
});
|
|
53
67
|
}
|
|
54
68
|
}
|
|
55
69
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"min-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC;AACzB,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,EACL,cAAc,EACd,WAAW,EACX,gBAAgB,EAChB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"min-hours-week.js","sourceRoot":"","sources":["../../../src/cpsat/rules/min-hours-week.ts"],"names":[],"mappings":"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"}
|