ross/proc-rota
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor weekend day balancing logic by commenting out unused option and storing adjusted targets on worker objects

Browse Source
This commit is contained in:
Ross
2025-12-17 12:39:11 +00:00
parent a54b5db5d2
commit 9d187dfa75
3 changed files with 21 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gen_cons.py
+1 -1
View File
@@ -488,7 +488,7 @@ def main(
balance_weekends=True,
max_shifts_per_week=6,
max_days_per_week_block=[(4, 2), (4, 4)],
balance_weekend_days=True,
#balance_weekend_days=True,
balance_weekend_days_quadratic=True,
weekend_day_hard_max_deviation=2,
balance_weekend_days_use_previous_shifts=True,
requirements.txt
Regular → Executable
+4 -1
View File
@@ -18,4 +18,7 @@ typer
django>=6.0,<7
django-crispy-forms
crispy-bulma
django-debug-toolbar
django-debug-toolbar
pandas
odfpy
openpyxl
rota_generator/shifts.py
+16 -59
View File
@@ -2596,7 +2596,10 @@ class RotaBuilder(object):
except Exception:
continue
weekend_day_shift_target_number = weekend_day_shift_target_number + prev_adj
# store adjusted per-day weekend target on the worker object for later use in objectives
if not hasattr(worker, 'weekend_day_target'):
worker.weekend_day_target = {}
worker.weekend_day_target[day_name] = weekend_day_shift_target_number
self.model.constraints.add(
self.model.weekend_day_shift_count_t1[worker.id, day_name]
- self.model.weekend_day_shift_count_t2[worker.id, day_name]
@@ -3587,64 +3590,18 @@ class RotaBuilder(object):
weekend_day_term = 0
if self.constraint_options_model.balance_weekend_days_quadratic:
wd_weight = self.constraint_options_model.balance_weekend_days_weight
# Quadratic penalty: strongly discourage deviations from per-day targets
weekend_day_term = 0
for worker in self.workers:
for day_name in ("Sat", "Sun"):
# base target derived from shift targets distributed over shift days
base_target = sum(
worker.shift_target_number[shift.name] / len(shift.days)
for shift in self.get_shifts()
if day_name in shift.days
)
# optionally include previous_shifts adjustments into the per-day target
prev_adj = 0.0
if self.use_previous_shifts and self.constraint_options_model.balance_weekend_days_use_previous_shifts:
for shift in self.get_shifts():
if day_name in shift.days and shift.name in getattr(worker, "previous_shifts", {}):
entry = worker.previous_shifts.get(shift.name)
if isinstance(entry, dict):
# prefer explicit per-day entry
if day_name in entry:
try:
worked = float(entry[day_name][0])
allocated = float(entry[day_name][1])
prev_adj += (allocated - worked)
except Exception:
continue
elif "__all__" in entry:
try:
worked = float(entry["__all__"][0])
allocated = float(entry["__all__"][1])
prev_adj += (allocated - worked) / max(1, len(shift.days))
except Exception:
continue
else:
# sum any tuple/list values found in the dict (spread over days)
try:
total_worked = 0.0
total_alloc = 0.0
for v in entry.values():
if isinstance(v, (list, tuple)):
total_worked += float(v[0])
total_alloc += float(v[1])
prev_adj += (total_alloc - total_worked) / max(1, len(shift.days))
except Exception:
continue
else:
try:
worked = float(entry[0])
allocated = float(entry[1])
prev_adj += (allocated - worked) / max(1, len(shift.days))
except Exception:
continue
adjusted_target = base_target + prev_adj
weekend_day_term += wd_weight * (
self.model.weekend_day_shift_count[(worker.id, day_name)] - adjusted_target
) ** 2
# HiGHS/appsi does not accept arbitrary nonlinear objective expressions here.
# Use the existing t1/t2 linear representation (which approximates absolute
# deviation) in the objective instead of a true squared term.
weekend_day_term = sum(
wd_weight
* (
self.model.weekend_day_shift_count_t1[(worker.id, day_name)]
+ self.model.weekend_day_shift_count_t2[(worker.id, day_name)]
)
for worker in self.workers
for day_name in ("Sat", "Sun")
)
elif self.constraint_options_model.balance_weekend_days:
weekend_day_modifier = self.constraint_options_model.balance_weekend_days_weight
weekend_day_term = sum(