Commit ·
1c5b273
1
Parent(s): 0484f98
正社員の最低5日休み制約と連続勤務6日上限制約を実装(Issue #4・#5)
Browse files両Issueが共用する出勤日変数 worked_day[emp][date] を導入し、
- 7日間スライディングウィンドウで連続勤務日数を6日以下に制限(Issue #5)
- 正社員は半月期間内で希望休含め最低5日の休みを取得(Issue #4)
をハード制約として solve()/_solve_best_effort() の両方に追加。
worked_day は既存の制約(スロットごとのadd_at_most_one、同日朝食/ディナー
掛け持ち禁止)により worked_b + worked_d ∈ {0,1} が保証されることを利用し、
単純な model.add(wd == worked_b + worked_d) で定義。
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- optimizer/solver.py +56 -0
optimizer/solver.py
CHANGED
|
@@ -488,6 +488,34 @@ def solve(
|
|
| 488 |
model.add(worked_d_prev + worked_b_next <= 1)
|
| 489 |
model.add(worked_b_prev + worked_d_next <= 1)
|
| 490 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 491 |
# ── 従業員×日付のパターン別勤務時間マップ ────────────────────────────
|
| 492 |
# (emp_id, date_str, slot_value) -> 実勤務時間(float)
|
| 493 |
req_hours: dict[tuple[int, str, str], float] = {}
|
|
@@ -903,6 +931,34 @@ def _solve_best_effort(
|
|
| 903 |
model.add(worked_d_prev + worked_b_next <= 1)
|
| 904 |
model.add(worked_b_prev + worked_d_next <= 1)
|
| 905 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 906 |
penalty_terms = []
|
| 907 |
STAFF_PENALTY = 1_000_000 # 人数不足ペナルティ(非常に高い)
|
| 908 |
LEADER_PENALTY = 800_000 # リーダー不足ペナルティ
|
|
|
|
| 488 |
model.add(worked_d_prev + worked_b_next <= 1)
|
| 489 |
model.add(worked_b_prev + worked_d_next <= 1)
|
| 490 |
|
| 491 |
+
# ── 出勤日変数 worked_day[emp][date](朝食 or ディナーいずれかに割当があれば1) ──
|
| 492 |
+
# Issue #4・#5 で共用
|
| 493 |
+
worked_day: dict[int, dict[str, object]] = {}
|
| 494 |
+
for emp in active_employees:
|
| 495 |
+
worked_day[emp.id] = {}
|
| 496 |
+
for ds in date_strs:
|
| 497 |
+
wd = model.new_bool_var(f"wd_{emp.id}_{ds}")
|
| 498 |
+
worked_b = sum(assign[emp.id][ds][TimeSlot.BREAKFAST.value][p.value] for p in positions)
|
| 499 |
+
worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
|
| 500 |
+
model.add(wd == worked_b + worked_d)
|
| 501 |
+
worked_day[emp.id][ds] = wd
|
| 502 |
+
|
| 503 |
+
# 6c. 連続勤務日数を6日までに制限(7日間スライディングウィンドウ・ハード制約 / Issue #5)
|
| 504 |
+
CONSECUTIVE_WINDOW = 7
|
| 505 |
+
MAX_CONSECUTIVE_DAYS = 6
|
| 506 |
+
for emp in active_employees:
|
| 507 |
+
for i in range(len(date_strs) - CONSECUTIVE_WINDOW + 1):
|
| 508 |
+
window = date_strs[i:i + CONSECUTIVE_WINDOW]
|
| 509 |
+
model.add(sum(worked_day[emp.id][d] for d in window) <= MAX_CONSECUTIVE_DAYS)
|
| 510 |
+
|
| 511 |
+
# 6d. 正社員は期間内(半月=2週間)で希望休含め最低5日の休みを取得(ハード制約 / Issue #4)
|
| 512 |
+
MIN_DAYS_OFF = 5
|
| 513 |
+
if len(date_strs) > MIN_DAYS_OFF:
|
| 514 |
+
max_work_days = len(date_strs) - MIN_DAYS_OFF
|
| 515 |
+
for emp in active_employees:
|
| 516 |
+
if emp.employment_type == EmploymentType.FULL_TIME:
|
| 517 |
+
model.add(sum(worked_day[emp.id][d] for d in date_strs) <= max_work_days)
|
| 518 |
+
|
| 519 |
# ── 従業員×日付のパターン別勤務時間マップ ────────────────────────────
|
| 520 |
# (emp_id, date_str, slot_value) -> 実勤務時間(float)
|
| 521 |
req_hours: dict[tuple[int, str, str], float] = {}
|
|
|
|
| 931 |
model.add(worked_d_prev + worked_b_next <= 1)
|
| 932 |
model.add(worked_b_prev + worked_d_next <= 1)
|
| 933 |
|
| 934 |
+
# ── 出勤日変数 worked_day[emp][date](朝食 or ディナーいずれかに割当があれば1) ──
|
| 935 |
+
# Issue #4・#5 で共用
|
| 936 |
+
worked_day: dict[int, dict[str, object]] = {}
|
| 937 |
+
for emp in active_employees:
|
| 938 |
+
worked_day[emp.id] = {}
|
| 939 |
+
for ds in date_strs:
|
| 940 |
+
wd = model.new_bool_var(f"be_wd_{emp.id}_{ds}")
|
| 941 |
+
worked_b = sum(assign[emp.id][ds][TimeSlot.BREAKFAST.value][p.value] for p in positions)
|
| 942 |
+
worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
|
| 943 |
+
model.add(wd == worked_b + worked_d)
|
| 944 |
+
worked_day[emp.id][ds] = wd
|
| 945 |
+
|
| 946 |
+
# 連続勤務日数を6日までに制限(7日間スライディングウィンドウ・ハード制約 / Issue #5)
|
| 947 |
+
CONSECUTIVE_WINDOW = 7
|
| 948 |
+
MAX_CONSECUTIVE_DAYS = 6
|
| 949 |
+
for emp in active_employees:
|
| 950 |
+
for i in range(len(date_strs) - CONSECUTIVE_WINDOW + 1):
|
| 951 |
+
window = date_strs[i:i + CONSECUTIVE_WINDOW]
|
| 952 |
+
model.add(sum(worked_day[emp.id][d] for d in window) <= MAX_CONSECUTIVE_DAYS)
|
| 953 |
+
|
| 954 |
+
# 正社員は期間内(半月=2週間)で希望休含め最低5日の休みを取得(ハード制約 / Issue #4)
|
| 955 |
+
MIN_DAYS_OFF = 5
|
| 956 |
+
if len(date_strs) > MIN_DAYS_OFF:
|
| 957 |
+
max_work_days = len(date_strs) - MIN_DAYS_OFF
|
| 958 |
+
for emp in active_employees:
|
| 959 |
+
if emp.employment_type == EmploymentType.FULL_TIME:
|
| 960 |
+
model.add(sum(worked_day[emp.id][d] for d in date_strs) <= max_work_days)
|
| 961 |
+
|
| 962 |
penalty_terms = []
|
| 963 |
STAFF_PENALTY = 1_000_000 # 人数不足ペナルティ(非常に高い)
|
| 964 |
LEADER_PENALTY = 800_000 # リーダー不足ペナルティ
|