m1m02530125 commited on
Commit
45054d8
·
1 Parent(s): 35fcb92

日をまたいだ朝食⇄ディナーの連続勤務を禁止するハード制約を追加 (#8)

Browse files

「前日ディナー→当日朝食」(休息時間が約7時間で不足)および
「前日朝食→当日ディナー」の組み合わせを、同一従業員に連続させない
ハード制約を solve / _solve_best_effort 双方に追加。休息時間確保のため
全従業員(社員・アルバイト)を対象とする。

Files changed (1) hide show
  1. optimizer/solver.py +22 -0
optimizer/solver.py CHANGED
@@ -476,6 +476,18 @@ def solve(
476
  worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
477
  model.add(worked_b + worked_d <= 1)
478
 
 
 
 
 
 
 
 
 
 
 
 
 
479
  # ── 従業員×日付のパターン別勤務時間マップ ────────────────────────────
480
  # (emp_id, date_str, slot_value) -> 実勤務時間(float)
481
  req_hours: dict[tuple[int, str, str], float] = {}
@@ -856,6 +868,16 @@ def _solve_best_effort(
856
  worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
857
  model.add(worked_b + worked_d <= 1)
858
 
 
 
 
 
 
 
 
 
 
 
859
  penalty_terms = []
860
  STAFF_PENALTY = 1_000_000 # 人数不足ペナルティ(非常に高い)
861
  LEADER_PENALTY = 800_000 # リーダー不足ペナルティ
 
476
  worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
477
  model.add(worked_b + worked_d <= 1)
478
 
479
+ # 6b. 日をまたいだ朝食⇄ディナーの連続勤務を禁止(休息時間確保のハード制約 / Issue #8)
480
+ # 「前日ディナー→当日朝食」(休息 約7時間で不足)「前日朝食→当日ディナー」の
481
+ # いずれも、同一従業員に連続させない
482
+ for emp in active_employees:
483
+ for ds, ds_next in zip(date_strs, date_strs[1:]):
484
+ worked_d_prev = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
485
+ worked_b_prev = sum(assign[emp.id][ds][TimeSlot.BREAKFAST.value][p.value] for p in positions)
486
+ worked_b_next = sum(assign[emp.id][ds_next][TimeSlot.BREAKFAST.value][p.value] for p in positions)
487
+ worked_d_next = sum(assign[emp.id][ds_next][TimeSlot.DINNER.value][p.value] for p in positions)
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] = {}
 
868
  worked_d = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
869
  model.add(worked_b + worked_d <= 1)
870
 
871
+ # 日をまたいだ朝食⇄ディナーの連続勤務を禁止(休息時間確保のハード制約 / Issue #8)
872
+ for emp in active_employees:
873
+ for ds, ds_next in zip(date_strs, date_strs[1:]):
874
+ worked_d_prev = sum(assign[emp.id][ds][TimeSlot.DINNER.value][p.value] for p in positions)
875
+ worked_b_prev = sum(assign[emp.id][ds][TimeSlot.BREAKFAST.value][p.value] for p in positions)
876
+ worked_b_next = sum(assign[emp.id][ds_next][TimeSlot.BREAKFAST.value][p.value] for p in positions)
877
+ worked_d_next = sum(assign[emp.id][ds_next][TimeSlot.DINNER.value][p.value] for p in positions)
878
+ model.add(worked_d_prev + worked_b_next <= 1)
879
+ model.add(worked_b_prev + worked_d_next <= 1)
880
+
881
  penalty_terms = []
882
  STAFF_PENALTY = 1_000_000 # 人数不足ペナルティ(非常に高い)
883
  LEADER_PENALTY = 800_000 # リーダー不足ペナルティ