Commit ·
2304909
1
Parent(s): 8cb7e47
feat: シフト自動生成の最適化優先度をUIから設定できるようにする
Browse filesSolverConfig dataclass を追加し、各ペナルティ重み(人件費最小化・
アルバイト希望充当・正社員両掛け持ち回避・人員バランス・深夜勤務分散)を
低/中/高のスケールで調整可能にした。
シフト自動生成画面に「最適化設定(優先度)」グループを追加。
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- optimizer/solver.py +40 -22
- ui/generate_view.py +67 -4
optimizer/solver.py
CHANGED
|
@@ -20,23 +20,41 @@ class SolveResult:
|
|
| 20 |
solve_time_sec: float
|
| 21 |
|
| 22 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 23 |
def solve(
|
| 24 |
period: SchedulePeriod,
|
| 25 |
employees: list[Employee],
|
| 26 |
requests: list[ShiftRequest],
|
|
|
|
| 27 |
) -> SolveResult:
|
| 28 |
"""
|
| 29 |
シフトを最適化して SolveResult を返す。
|
| 30 |
|
| 31 |
優先順位(ソフト制約のペナルティ重み):
|
| 32 |
-
1. 人件費最小化(総時間削減) weight=1000
|
| 33 |
-
2.
|
| 34 |
-
|
| 35 |
-
|
| 36 |
-
|
|
|
|
| 37 |
"""
|
| 38 |
import time
|
| 39 |
t0 = time.time()
|
|
|
|
|
|
|
| 40 |
|
| 41 |
warnings: list[str] = []
|
| 42 |
errors: list[str] = []
|
|
@@ -194,34 +212,30 @@ def solve(
|
|
| 194 |
DEFAULT_SLOT_HOURS[slot]
|
| 195 |
)
|
| 196 |
# CP-SATは整数のみ → 時間×10で精度を保ちつつ整数化
|
| 197 |
-
|
|
|
|
| 198 |
|
| 199 |
# P2: 正社員の両時間帯掛け持ちにペナルティ
|
|
|
|
| 200 |
for dv in double_vars.values():
|
| 201 |
-
penalty_terms.append(
|
| 202 |
|
| 203 |
# P2b: 深夜(ディナー22:00〜23:00)の集中を防ぐ
|
| 204 |
# ディナー担当は全員深夜1時間が発生するが、特定人物への集中は偏差で管理
|
| 205 |
-
dinner_count: dict[int, list] = {emp.id: [] for emp in active_employees}
|
| 206 |
-
for emp in active_employees:
|
| 207 |
-
for ds in date_strs:
|
| 208 |
-
for pos in positions:
|
| 209 |
-
v = assign[emp.id][ds][TimeSlot.DINNER.value][pos.value]
|
| 210 |
-
dinner_count[emp.id].append(v)
|
| 211 |
-
|
| 212 |
# 深夜掛け持ちペナルティ: 個人のディナー合計の2乗を最小化(凸的分散)
|
| 213 |
# ※ CP-SATは2次項不可のため、線形近似(合計に重み)
|
|
|
|
| 214 |
for emp in active_employees:
|
| 215 |
for ds in date_strs:
|
| 216 |
for pos in positions:
|
| 217 |
v = assign[emp.id][ds][TimeSlot.DINNER.value][pos.value]
|
| 218 |
-
penalty_terms.append(
|
| 219 |
|
| 220 |
# P3: 希望を通す = 希望があるのに入れない場合ペナルティ
|
| 221 |
# 正社員優先充当ルール: 正社員の未充当は最高優先でペナルティを課す
|
| 222 |
# → 正社員が希望した枠には必ず入れ、余りをアルバイトで補完する
|
| 223 |
-
FT_NOT_WORKED_PENALTY = 200_000 # 正社員: P1コスト(最大〜100000)を上回る重み
|
| 224 |
-
PT_NOT_WORKED_PENALTY = 100
|
| 225 |
for emp in active_employees:
|
| 226 |
penalty = (FT_NOT_WORKED_PENALTY
|
| 227 |
if emp.employment_type == EmploymentType.FULL_TIME
|
|
@@ -238,13 +252,14 @@ def solve(
|
|
| 238 |
# P4: 人員バランス = ポジション毎の総シフト数の偏差を最小化
|
| 239 |
# 各日の各(スロット×ポジション)の担当人数を均等にするため、
|
| 240 |
# 1日の担当数の最大・最小差をペナルティに
|
|
|
|
| 241 |
for emp in active_employees:
|
| 242 |
total_worked = sum(
|
| 243 |
assign[emp.id][ds][slot.value][pos.value]
|
| 244 |
for ds in date_strs for slot in slots for pos in positions
|
| 245 |
)
|
| 246 |
# ダミーで総勤務回数の二乗偏差を線形��似
|
| 247 |
-
penalty_terms.append(
|
| 248 |
|
| 249 |
model.minimize(sum(penalty_terms))
|
| 250 |
|
|
@@ -274,7 +289,7 @@ def solve(
|
|
| 274 |
# ベストエフォート生成: 人数・リーダー制約をソフト化して再実行
|
| 275 |
best_assignments, best_warnings = _solve_best_effort(
|
| 276 |
active_employees, date_strs, slots, positions,
|
| 277 |
-
req_map, req_hours
|
| 278 |
)
|
| 279 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
| 280 |
|
|
@@ -303,10 +318,12 @@ def _extract_assignments(solver, assign, active_employees, date_strs, slots, pos
|
|
| 303 |
|
| 304 |
def _solve_best_effort(
|
| 305 |
active_employees, date_strs, slots, positions,
|
| 306 |
-
req_map, req_hours
|
| 307 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 308 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
| 309 |
import time
|
|
|
|
|
|
|
| 310 |
model = cp_model.CpModel()
|
| 311 |
|
| 312 |
assign: dict = {}
|
|
@@ -395,10 +412,11 @@ def _solve_best_effort(
|
|
| 395 |
for pos in positions:
|
| 396 |
var = assign[emp.id][ds][slot.value][pos.value]
|
| 397 |
hours = req_hours.get((emp.id, ds, slot.value), DEFAULT_SLOT_HOURS[slot])
|
| 398 |
-
|
|
|
|
| 399 |
|
| 400 |
FT_PENALTY = 200_000
|
| 401 |
-
PT_PENALTY = 100
|
| 402 |
for emp in active_employees:
|
| 403 |
penalty = FT_PENALTY if emp.employment_type.value == "full_time" else PT_PENALTY
|
| 404 |
for ds in date_strs:
|
|
|
|
| 20 |
solve_time_sec: float
|
| 21 |
|
| 22 |
|
| 23 |
+
# スケール係数のプリセット
|
| 24 |
+
PRIORITY_SCALE = {"低": 0.1, "中": 1.0, "高": 10.0}
|
| 25 |
+
|
| 26 |
+
|
| 27 |
+
@dataclass
|
| 28 |
+
class SolverConfig:
|
| 29 |
+
"""最適化の優先度設定(各スケールは PRIORITY_SCALE の値を使用)"""
|
| 30 |
+
cost_scale: float = 1.0 # 人件費最小化
|
| 31 |
+
pt_pref_scale: float = 1.0 # アルバイト希望充当
|
| 32 |
+
double_penalty_scale: float = 1.0 # 正社員両掛け持ち回避
|
| 33 |
+
balance_scale: float = 1.0 # 人員バランス均等化
|
| 34 |
+
late_night_scale: float = 1.0 # 深夜勤務分散
|
| 35 |
+
|
| 36 |
+
|
| 37 |
def solve(
|
| 38 |
period: SchedulePeriod,
|
| 39 |
employees: list[Employee],
|
| 40 |
requests: list[ShiftRequest],
|
| 41 |
+
config: SolverConfig | None = None,
|
| 42 |
) -> SolveResult:
|
| 43 |
"""
|
| 44 |
シフトを最適化して SolveResult を返す。
|
| 45 |
|
| 46 |
優先順位(ソフト制約のペナルティ重み):
|
| 47 |
+
1. 人件費最小化(総時間削減) weight=1000 × cost_scale
|
| 48 |
+
2. 正社員両掛け持ち回避 weight=500 × double_penalty_scale
|
| 49 |
+
2b. 深夜勤務分散 weight=500 × late_night_scale
|
| 50 |
+
3a. 正社員希望を必ず通す weight=200000(固定)
|
| 51 |
+
3b. アルバイト希望を通す weight=100 × pt_pref_scale
|
| 52 |
+
4. 人員バランス均等化 weight=10 × balance_scale
|
| 53 |
"""
|
| 54 |
import time
|
| 55 |
t0 = time.time()
|
| 56 |
+
if config is None:
|
| 57 |
+
config = SolverConfig()
|
| 58 |
|
| 59 |
warnings: list[str] = []
|
| 60 |
errors: list[str] = []
|
|
|
|
| 212 |
DEFAULT_SLOT_HOURS[slot]
|
| 213 |
)
|
| 214 |
# CP-SATは整数のみ → 時間×10で精度を保ちつつ整数化
|
| 215 |
+
w = max(1, int(1000 * hours * 10 * config.cost_scale))
|
| 216 |
+
penalty_terms.append(w * var)
|
| 217 |
|
| 218 |
# P2: 正社員の両時間帯掛け持ちにペナルティ
|
| 219 |
+
double_w = max(1, int(500 * config.double_penalty_scale))
|
| 220 |
for dv in double_vars.values():
|
| 221 |
+
penalty_terms.append(double_w * dv)
|
| 222 |
|
| 223 |
# P2b: 深夜(ディナー22:00〜23:00)の集中を防ぐ
|
| 224 |
# ディナー担当は全員深夜1時間が発生するが、特定人物への集中は偏差で管理
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 225 |
# 深夜掛け持ちペナルティ: 個人のディナー合計の2乗を最小化(凸的分散)
|
| 226 |
# ※ CP-SATは2次項不可のため、線形近似(合計に重み)
|
| 227 |
+
late_night_w = max(1, int(500 * config.late_night_scale))
|
| 228 |
for emp in active_employees:
|
| 229 |
for ds in date_strs:
|
| 230 |
for pos in positions:
|
| 231 |
v = assign[emp.id][ds][TimeSlot.DINNER.value][pos.value]
|
| 232 |
+
penalty_terms.append(late_night_w * v) # ディナー1回ごとにペナルティ
|
| 233 |
|
| 234 |
# P3: 希望を通す = 希望があるのに入れない場合ペナルティ
|
| 235 |
# 正社員優先充当ルール: 正社員の未充当は最高優先でペナルティを課す
|
| 236 |
# → 正社員が希望した枠には必ず入れ、余りをアルバイトで補完する
|
| 237 |
+
FT_NOT_WORKED_PENALTY = 200_000 # 正社員: P1コスト(最大〜100000)を上回る重み(固定)
|
| 238 |
+
PT_NOT_WORKED_PENALTY = max(1, int(100 * config.pt_pref_scale))
|
| 239 |
for emp in active_employees:
|
| 240 |
penalty = (FT_NOT_WORKED_PENALTY
|
| 241 |
if emp.employment_type == EmploymentType.FULL_TIME
|
|
|
|
| 252 |
# P4: 人員バランス = ポジション毎の総シフト数の偏差を最小化
|
| 253 |
# 各日の各(スロット×ポジション)の担当人数を均等にするため、
|
| 254 |
# 1日の担当数の最大・最小差をペナルティに
|
| 255 |
+
balance_w = max(1, int(10 * config.balance_scale))
|
| 256 |
for emp in active_employees:
|
| 257 |
total_worked = sum(
|
| 258 |
assign[emp.id][ds][slot.value][pos.value]
|
| 259 |
for ds in date_strs for slot in slots for pos in positions
|
| 260 |
)
|
| 261 |
# ダミーで総勤務回数の二乗偏差を線形��似
|
| 262 |
+
penalty_terms.append(balance_w * total_worked)
|
| 263 |
|
| 264 |
model.minimize(sum(penalty_terms))
|
| 265 |
|
|
|
|
| 289 |
# ベストエフォート生成: 人数・リーダー制約をソフト化して再実行
|
| 290 |
best_assignments, best_warnings = _solve_best_effort(
|
| 291 |
active_employees, date_strs, slots, positions,
|
| 292 |
+
req_map, req_hours, config
|
| 293 |
)
|
| 294 |
_check_warnings(best_assignments, date_strs, best_warnings)
|
| 295 |
|
|
|
|
| 318 |
|
| 319 |
def _solve_best_effort(
|
| 320 |
active_employees, date_strs, slots, positions,
|
| 321 |
+
req_map, req_hours, config: SolverConfig | None = None,
|
| 322 |
) -> tuple[list[ShiftAssignment], list[str]]:
|
| 323 |
"""人数・リーダー制約をソフト化してベストエフォートのシフトを生成する"""
|
| 324 |
import time
|
| 325 |
+
if config is None:
|
| 326 |
+
config = SolverConfig()
|
| 327 |
model = cp_model.CpModel()
|
| 328 |
|
| 329 |
assign: dict = {}
|
|
|
|
| 412 |
for pos in positions:
|
| 413 |
var = assign[emp.id][ds][slot.value][pos.value]
|
| 414 |
hours = req_hours.get((emp.id, ds, slot.value), DEFAULT_SLOT_HOURS[slot])
|
| 415 |
+
w = max(1, int(1000 * hours * 10 * config.cost_scale))
|
| 416 |
+
penalty_terms.append(w * var)
|
| 417 |
|
| 418 |
FT_PENALTY = 200_000
|
| 419 |
+
PT_PENALTY = max(1, int(100 * config.pt_pref_scale))
|
| 420 |
for emp in active_employees:
|
| 421 |
penalty = FT_PENALTY if emp.employment_type.value == "full_time" else PT_PENALTY
|
| 422 |
for ds in date_strs:
|
ui/generate_view.py
CHANGED
|
@@ -9,21 +9,22 @@ from PyQt6.QtWidgets import (
|
|
| 9 |
from PyQt6.QtCore import Qt, QThread, pyqtSignal, QObject
|
| 10 |
from PyQt6.QtGui import QFont, QColor
|
| 11 |
from db import repositories as repo
|
| 12 |
-
from optimizer.solver import solve, SolveResult
|
| 13 |
from utils.theme import theme
|
| 14 |
|
| 15 |
|
| 16 |
class SolverWorker(QObject):
|
| 17 |
finished = pyqtSignal(object) # SolveResult
|
| 18 |
|
| 19 |
-
def __init__(self, period, employees, requests):
|
| 20 |
super().__init__()
|
| 21 |
self.period = period
|
| 22 |
self.employees = employees
|
| 23 |
self.requests = requests
|
|
|
|
| 24 |
|
| 25 |
def run(self):
|
| 26 |
-
result = solve(self.period, self.employees, self.requests)
|
| 27 |
self.finished.emit(result)
|
| 28 |
|
| 29 |
|
|
@@ -66,6 +67,48 @@ class GenerateView(QWidget):
|
|
| 66 |
check_layout.addWidget(self.check_label)
|
| 67 |
layout.addWidget(check_group)
|
| 68 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 69 |
# 生成ボタン
|
| 70 |
btn_row = QHBoxLayout()
|
| 71 |
btn_row.addStretch()
|
|
@@ -115,6 +158,11 @@ class GenerateView(QWidget):
|
|
| 115 |
f" QPushButton:hover {{ background:{c['success_hover']}; }}"
|
| 116 |
f" QPushButton:disabled {{ background:{c['success_dis']}; }}"
|
| 117 |
)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 118 |
|
| 119 |
def apply_theme(self):
|
| 120 |
self._apply_btn_styles()
|
|
@@ -177,7 +225,7 @@ class GenerateView(QWidget):
|
|
| 177 |
self.result_text.setPlainText("最適化中です。しばらくお待ちください…")
|
| 178 |
|
| 179 |
self._thread = QThread()
|
| 180 |
-
self._worker = SolverWorker(self._period, employees, requests)
|
| 181 |
self._worker.moveToThread(self._thread)
|
| 182 |
self._thread.started.connect(self._worker.run)
|
| 183 |
self._worker.finished.connect(self._on_finished)
|
|
@@ -218,6 +266,21 @@ class GenerateView(QWidget):
|
|
| 218 |
|
| 219 |
self.result_text.setPlainText("\n".join(lines))
|
| 220 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 221 |
def _on_go_to_edit(self):
|
| 222 |
if self._period:
|
| 223 |
self.schedule_generated.emit(self._period.id)
|
|
|
|
| 9 |
from PyQt6.QtCore import Qt, QThread, pyqtSignal, QObject
|
| 10 |
from PyQt6.QtGui import QFont, QColor
|
| 11 |
from db import repositories as repo
|
| 12 |
+
from optimizer.solver import solve, SolveResult, SolverConfig, PRIORITY_SCALE
|
| 13 |
from utils.theme import theme
|
| 14 |
|
| 15 |
|
| 16 |
class SolverWorker(QObject):
|
| 17 |
finished = pyqtSignal(object) # SolveResult
|
| 18 |
|
| 19 |
+
def __init__(self, period, employees, requests, config: SolverConfig):
|
| 20 |
super().__init__()
|
| 21 |
self.period = period
|
| 22 |
self.employees = employees
|
| 23 |
self.requests = requests
|
| 24 |
+
self.config = config
|
| 25 |
|
| 26 |
def run(self):
|
| 27 |
+
result = solve(self.period, self.employees, self.requests, self.config)
|
| 28 |
self.finished.emit(result)
|
| 29 |
|
| 30 |
|
|
|
|
| 67 |
check_layout.addWidget(self.check_label)
|
| 68 |
layout.addWidget(check_group)
|
| 69 |
|
| 70 |
+
# 最適化設定
|
| 71 |
+
config_group = QGroupBox("最適化設定(優先度)")
|
| 72 |
+
config_vl = QVBoxLayout(config_group)
|
| 73 |
+
config_vl.setSpacing(8)
|
| 74 |
+
|
| 75 |
+
# 優先度設定行: (表示名, attr名, ツールチップ)
|
| 76 |
+
_CONFIG_ROWS = [
|
| 77 |
+
("人件費最小化", "cost_scale", "人件費が低い人員配置を優先"),
|
| 78 |
+
("アルバイト希望充当", "pt_pref_scale", "アルバイトの希望シフトを優先して通す"),
|
| 79 |
+
("正社員両掛け持ち回避", "double_penalty_scale", "正社員が朝食・ディナー両方に入ることを抑制"),
|
| 80 |
+
("人員バランス均等化", "balance_scale", "特定の人に勤務が偏らないよう均等化"),
|
| 81 |
+
("深夜勤務分散", "late_night_scale", "ディナー(深夜枠)の担当を分散させる"),
|
| 82 |
+
]
|
| 83 |
+
|
| 84 |
+
self._config_combos: dict[str, QComboBox] = {}
|
| 85 |
+
for display_name, attr, tooltip in _CONFIG_ROWS:
|
| 86 |
+
row = QHBoxLayout()
|
| 87 |
+
lbl = QLabel(display_name)
|
| 88 |
+
lbl.setToolTip(tooltip)
|
| 89 |
+
lbl.setMinimumWidth(160)
|
| 90 |
+
combo = QComboBox()
|
| 91 |
+
combo.addItem("低", "低")
|
| 92 |
+
combo.addItem("中", "中")
|
| 93 |
+
combo.addItem("高", "高")
|
| 94 |
+
combo.setCurrentIndex(1) # デフォルト「中」
|
| 95 |
+
combo.setFixedWidth(80)
|
| 96 |
+
self._config_combos[attr] = combo
|
| 97 |
+
row.addWidget(lbl)
|
| 98 |
+
row.addWidget(combo)
|
| 99 |
+
row.addStretch()
|
| 100 |
+
config_vl.addLayout(row)
|
| 101 |
+
|
| 102 |
+
# リセットボタン
|
| 103 |
+
reset_row = QHBoxLayout()
|
| 104 |
+
reset_row.addStretch()
|
| 105 |
+
self._btn_reset = QPushButton("デフォルトに戻す")
|
| 106 |
+
self._btn_reset.setFixedHeight(28)
|
| 107 |
+
self._btn_reset.clicked.connect(self._reset_config)
|
| 108 |
+
reset_row.addWidget(self._btn_reset)
|
| 109 |
+
config_vl.addLayout(reset_row)
|
| 110 |
+
layout.addWidget(config_group)
|
| 111 |
+
|
| 112 |
# 生成ボタン
|
| 113 |
btn_row = QHBoxLayout()
|
| 114 |
btn_row.addStretch()
|
|
|
|
| 158 |
f" QPushButton:hover {{ background:{c['success_hover']}; }}"
|
| 159 |
f" QPushButton:disabled {{ background:{c['success_dis']}; }}"
|
| 160 |
)
|
| 161 |
+
self._btn_reset.setStyleSheet(
|
| 162 |
+
f"QPushButton {{ background:{c['surface']}; border:1px solid {c['border2']}; "
|
| 163 |
+
f"border-radius:4px; color:{c['text']}; padding:0 12px; }}"
|
| 164 |
+
f" QPushButton:hover {{ background:{c['surface2']}; }}"
|
| 165 |
+
)
|
| 166 |
|
| 167 |
def apply_theme(self):
|
| 168 |
self._apply_btn_styles()
|
|
|
|
| 225 |
self.result_text.setPlainText("最適化中です。しばらくお待ちください…")
|
| 226 |
|
| 227 |
self._thread = QThread()
|
| 228 |
+
self._worker = SolverWorker(self._period, employees, requests, self._build_config())
|
| 229 |
self._worker.moveToThread(self._thread)
|
| 230 |
self._thread.started.connect(self._worker.run)
|
| 231 |
self._worker.finished.connect(self._on_finished)
|
|
|
|
| 266 |
|
| 267 |
self.result_text.setPlainText("\n".join(lines))
|
| 268 |
|
| 269 |
+
def _reset_config(self):
|
| 270 |
+
for combo in self._config_combos.values():
|
| 271 |
+
combo.setCurrentIndex(1) # 「中」
|
| 272 |
+
|
| 273 |
+
def _build_config(self) -> SolverConfig:
|
| 274 |
+
scales = {attr: PRIORITY_SCALE[combo.currentData()]
|
| 275 |
+
for attr, combo in self._config_combos.items()}
|
| 276 |
+
return SolverConfig(
|
| 277 |
+
cost_scale=scales["cost_scale"],
|
| 278 |
+
pt_pref_scale=scales["pt_pref_scale"],
|
| 279 |
+
double_penalty_scale=scales["double_penalty_scale"],
|
| 280 |
+
balance_scale=scales["balance_scale"],
|
| 281 |
+
late_night_scale=scales["late_night_scale"],
|
| 282 |
+
)
|
| 283 |
+
|
| 284 |
def _on_go_to_edit(self):
|
| 285 |
if self._period:
|
| 286 |
self.schedule_generated.emit(self._period.id)
|