Commit ·
35fcb92
1
Parent(s): f9ee8d9
朝食キッチンにロング勤務(〜15:30頃)対象者を最低1名配置する制約を追加 (#6)
Browse files希望シフトに b_long/b_half 等、終了時刻が14:00以降のパターン(カスタム含む)を
選択した従業員を long_breakfast_set として収集し、各日の朝食キッチンに最低1名
配置するハード制約を追加。該当者がいない日は警告を出して制約をスキップする。
ベストエフォート求解にも同等のソフト制約(高ペナルティ)として実装。
- optimizer/solver.py +36 -0
- utils/shift_patterns.py +19 -0
optimizer/solver.py
CHANGED
|
@@ -11,6 +11,7 @@ from utils.constants import (
|
|
| 11 |
)
|
| 12 |
from utils.solver_logger import logger
|
| 13 |
from utils.reservation import tiered_extra
|
|
|
|
| 14 |
|
| 15 |
|
| 16 |
@dataclass
|
|
@@ -139,6 +140,8 @@ def solve(
|
|
| 139 |
off_map: dict[tuple[int, str], bool] = {} # 社員の休希望・有休
|
| 140 |
# 社員のフレックス出勤(朝のみ可→ディナー不可、晩のみ可→朝食不可)
|
| 141 |
slot_block_map: dict[tuple[int, str], TimeSlot] = {}
|
|
|
|
|
|
|
| 142 |
for r in requests:
|
| 143 |
if r.pattern_id in ("off_request", "paid_leave"):
|
| 144 |
off_map[(r.employee_id, r.date)] = True
|
|
@@ -151,6 +154,8 @@ def solve(
|
|
| 151 |
req_map[(r.employee_id, r.date, TimeSlot.BREAKFAST.value)] = True
|
| 152 |
if r.dinner:
|
| 153 |
req_map[(r.employee_id, r.date, TimeSlot.DINNER.value)] = True
|
|
|
|
|
|
|
| 154 |
|
| 155 |
active_employees = [e for e in employees if e.is_active]
|
| 156 |
|
|
@@ -448,6 +453,20 @@ def solve(
|
|
| 448 |
if ldr_b_vars:
|
| 449 |
model.add(sum(ldr_b_vars) >= min(min_cln_ldr, len(ldr_b_vars)))
|
| 450 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 451 |
# 6. 正社員の両時間帯掛け持ちを物理的に禁止(ハード制約)
|
| 452 |
# 朝食+ディナーの合計を 1 以下に制限
|
| 453 |
for emp in active_employees:
|
|
@@ -684,6 +703,7 @@ def solve(
|
|
| 684 |
shift_constraints=shift_constraints,
|
| 685 |
reservation_counts=reservation_counts,
|
| 686 |
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d,
|
|
|
|
| 687 |
period_id=period_id or (progress_callback._period_id if progress_callback else None),
|
| 688 |
)
|
| 689 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
|
@@ -754,6 +774,7 @@ def _solve_best_effort(
|
|
| 754 |
reservation_counts: dict | None = None,
|
| 755 |
reserv_tiers_b: list[tuple[int, int]] | None = None,
|
| 756 |
reserv_tiers_d: list[tuple[int, int]] | None = None,
|
|
|
|
| 757 |
period_id: int | None = None,
|
| 758 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 759 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
|
@@ -769,6 +790,8 @@ def _solve_best_effort(
|
|
| 769 |
reserv_tiers_b = []
|
| 770 |
if reserv_tiers_d is None:
|
| 771 |
reserv_tiers_d = []
|
|
|
|
|
|
|
| 772 |
model = cp_model.CpModel()
|
| 773 |
|
| 774 |
assign: dict = {}
|
|
@@ -880,6 +903,19 @@ def _solve_best_effort(
|
|
| 880 |
model.add(sum(leader_vars) + lshortfall >= min_leader)
|
| 881 |
penalty_terms.append(LEADER_PENALTY * lshortfall)
|
| 882 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 883 |
# 元のソフト制約(P1: 人件費、P3: 希望充当)も追加
|
| 884 |
DEFAULT_SLOT_HOURS = {TimeSlot.BREAKFAST: 5.0, TimeSlot.DINNER: 6.0}
|
| 885 |
for emp in active_employees:
|
|
|
|
| 11 |
)
|
| 12 |
from utils.solver_logger import logger
|
| 13 |
from utils.reservation import tiered_extra
|
| 14 |
+
from utils.shift_patterns import is_long_breakfast_pattern
|
| 15 |
|
| 16 |
|
| 17 |
@dataclass
|
|
|
|
| 140 |
off_map: dict[tuple[int, str], bool] = {} # 社員の休希望・有休
|
| 141 |
# 社員のフレックス出勤(朝のみ可→ディナー不可、晩のみ可→朝食不可)
|
| 142 |
slot_block_map: dict[tuple[int, str], TimeSlot] = {}
|
| 143 |
+
# 朝食「ロング勤務」(〜15:30頃まで)希望の (employee_id, date) 集合
|
| 144 |
+
long_breakfast_set: set[tuple[int, str]] = set()
|
| 145 |
for r in requests:
|
| 146 |
if r.pattern_id in ("off_request", "paid_leave"):
|
| 147 |
off_map[(r.employee_id, r.date)] = True
|
|
|
|
| 154 |
req_map[(r.employee_id, r.date, TimeSlot.BREAKFAST.value)] = True
|
| 155 |
if r.dinner:
|
| 156 |
req_map[(r.employee_id, r.date, TimeSlot.DINNER.value)] = True
|
| 157 |
+
if is_long_breakfast_pattern(r.pattern_id, r.custom_start, r.custom_end):
|
| 158 |
+
long_breakfast_set.add((r.employee_id, r.date))
|
| 159 |
|
| 160 |
active_employees = [e for e in employees if e.is_active]
|
| 161 |
|
|
|
|
| 453 |
if ldr_b_vars:
|
| 454 |
model.add(sum(ldr_b_vars) >= min(min_cln_ldr, len(ldr_b_vars)))
|
| 455 |
|
| 456 |
+
# 5d. 朝食キッチンに「ロング勤務」(〜15:30頃まで)対象者を最低1名配置(ハード制約 / Issue #6)
|
| 457 |
+
for ds in date_strs:
|
| 458 |
+
long_candidates = [emp for emp in active_employees if (emp.id, ds) in long_breakfast_set]
|
| 459 |
+
if long_candidates:
|
| 460 |
+
long_vars = [
|
| 461 |
+
assign[emp.id][ds][TimeSlot.BREAKFAST.value][Position.KITCHEN.value]
|
| 462 |
+
for emp in long_candidates
|
| 463 |
+
]
|
| 464 |
+
model.add(sum(long_vars) >= 1)
|
| 465 |
+
else:
|
| 466 |
+
warnings.append(
|
| 467 |
+
f"{ds} 朝食 キッチン: ロング勤務(〜15:30頃まで)希望者がいません"
|
| 468 |
+
)
|
| 469 |
+
|
| 470 |
# 6. 正社員の両時間帯掛け持ちを物理的に禁止(ハード制約)
|
| 471 |
# 朝食+ディナーの合計を 1 以下に制限
|
| 472 |
for emp in active_employees:
|
|
|
|
| 703 |
shift_constraints=shift_constraints,
|
| 704 |
reservation_counts=reservation_counts,
|
| 705 |
reserv_tiers_b=reserv_tiers_b, reserv_tiers_d=reserv_tiers_d,
|
| 706 |
+
long_breakfast_set=long_breakfast_set,
|
| 707 |
period_id=period_id or (progress_callback._period_id if progress_callback else None),
|
| 708 |
)
|
| 709 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
|
|
|
| 774 |
reservation_counts: dict | None = None,
|
| 775 |
reserv_tiers_b: list[tuple[int, int]] | None = None,
|
| 776 |
reserv_tiers_d: list[tuple[int, int]] | None = None,
|
| 777 |
+
long_breakfast_set: set[tuple[int, str]] | None = None,
|
| 778 |
period_id: int | None = None,
|
| 779 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 780 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
|
|
|
| 790 |
reserv_tiers_b = []
|
| 791 |
if reserv_tiers_d is None:
|
| 792 |
reserv_tiers_d = []
|
| 793 |
+
if long_breakfast_set is None:
|
| 794 |
+
long_breakfast_set = set()
|
| 795 |
model = cp_model.CpModel()
|
| 796 |
|
| 797 |
assign: dict = {}
|
|
|
|
| 903 |
model.add(sum(leader_vars) + lshortfall >= min_leader)
|
| 904 |
penalty_terms.append(LEADER_PENALTY * lshortfall)
|
| 905 |
|
| 906 |
+
# 朝食キッチンのロング勤務必須(ソフト化版 / Issue #6)
|
| 907 |
+
LONG_BREAKFAST_PENALTY = 700_000
|
| 908 |
+
for ds in date_strs:
|
| 909 |
+
long_candidates = [emp for emp in active_employees if (emp.id, ds) in long_breakfast_set]
|
| 910 |
+
if long_candidates:
|
| 911 |
+
long_vars = [
|
| 912 |
+
assign[emp.id][ds][TimeSlot.BREAKFAST.value][Position.KITCHEN.value]
|
| 913 |
+
for emp in long_candidates
|
| 914 |
+
]
|
| 915 |
+
lb_shortfall = model.new_int_var(0, 1, f"lbsf_{ds}")
|
| 916 |
+
model.add(sum(long_vars) + lb_shortfall >= 1)
|
| 917 |
+
penalty_terms.append(LONG_BREAKFAST_PENALTY * lb_shortfall)
|
| 918 |
+
|
| 919 |
# 元のソフト制約(P1: 人件費、P3: 希望充当)も追加
|
| 920 |
DEFAULT_SLOT_HOURS = {TimeSlot.BREAKFAST: 5.0, TimeSlot.DINNER: 6.0}
|
| 921 |
for emp in active_employees:
|
utils/shift_patterns.py
CHANGED
|
@@ -15,6 +15,9 @@ DINNER_START = 17.0 # 17:00
|
|
| 15 |
DINNER_END = 23.0 # 23:00
|
| 16 |
MIN_OVERLAP_HRS = 2.0 # この時間以上重なれば「担当」とみなす
|
| 17 |
|
|
|
|
|
|
|
|
|
|
| 18 |
|
| 19 |
@dataclass(frozen=True)
|
| 20 |
class ShiftPattern:
|
|
@@ -99,6 +102,22 @@ ALL_PATTERNS: list[ShiftPattern] = [
|
|
| 99 |
PATTERN_MAP: dict[str, ShiftPattern] = {p.id: p for p in ALL_PATTERNS}
|
| 100 |
|
| 101 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 102 |
def default_pattern_from_fixed(breakfast: bool, dinner: bool) -> Optional[str]:
|
| 103 |
"""固定パターン(breakfast/dinner boolean)から既定のパターンIDを返す"""
|
| 104 |
if breakfast and dinner:
|
|
|
|
| 15 |
DINNER_END = 23.0 # 23:00
|
| 16 |
MIN_OVERLAP_HRS = 2.0 # この時間以上重なれば「担当」とみなす
|
| 17 |
|
| 18 |
+
# 朝食「ロング勤務」とみなす終了時刻の下限(この時刻以降まで勤務するパターンが対象)
|
| 19 |
+
LONG_BREAKFAST_END_HOUR = 14.0 # 14:00
|
| 20 |
+
|
| 21 |
|
| 22 |
@dataclass(frozen=True)
|
| 23 |
class ShiftPattern:
|
|
|
|
| 102 |
PATTERN_MAP: dict[str, ShiftPattern] = {p.id: p for p in ALL_PATTERNS}
|
| 103 |
|
| 104 |
|
| 105 |
+
def is_long_breakfast_pattern(pattern_id: Optional[str],
|
| 106 |
+
custom_start: Optional[str] = None,
|
| 107 |
+
custom_end: Optional[str] = None) -> bool:
|
| 108 |
+
"""朝食「ロング勤務」(終了時刻が LONG_BREAKFAST_END_HOUR 以降)に該当するか判定"""
|
| 109 |
+
if pattern_id == "custom":
|
| 110 |
+
if not custom_start or not custom_end:
|
| 111 |
+
return False
|
| 112 |
+
sp = ShiftPattern("_c", "カスタム", custom_start, custom_end)
|
| 113 |
+
else:
|
| 114 |
+
sp = PATTERN_MAP.get(pattern_id) if pattern_id else None
|
| 115 |
+
if not sp or not sp.covers_breakfast():
|
| 116 |
+
return False
|
| 117 |
+
end_hour = sp.end_hour()
|
| 118 |
+
return end_hour is not None and end_hour >= LONG_BREAKFAST_END_HOUR
|
| 119 |
+
|
| 120 |
+
|
| 121 |
def default_pattern_from_fixed(breakfast: bool, dinner: bool) -> Optional[str]:
|
| 122 |
"""固定パターン(breakfast/dinner boolean)から既定のパターンIDを返す"""
|
| 123 |
if breakfast and dinner:
|