From 9af01a34153cacb74b8b7ccf562af0eb29ac146d Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 31 Dec 2024 22:51:26 +0000 Subject: [PATCH] fix shift solver (objective didn't seem to be used) --- rota/shifts.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rota/shifts.py b/rota/shifts.py index 4ea9f26..7aa7e68 100644 --- a/rota/shifts.py +++ b/rota/shifts.py @@ -2389,7 +2389,7 @@ class RotaBuilder(object): shift_balancing = 0 if self.constraint_options["balance_shifts_quadratic"]: - shift_balancing = sum( + quadratic_shift_balancing = sum( balance_modifier_constant * ( self.model.shift_count_t1[worker.id, shift.name] @@ -2399,7 +2399,7 @@ class RotaBuilder(object): for shift in self.get_shifts() ) else: - shift_balancing = 0 + quadratic_shift_balancing = 0 if self.constraint_options["minimise_shift_diffs"]: shift_diff_modifier_constant = 10 @@ -2517,6 +2517,7 @@ class RotaBuilder(object): # worker_pairs_balancing = worker_pairs_balancing + sum(self.model.works[worker_a.id, week, day, shift] for shift in self.get_shift_names_by_week_day(week, day)) * sum(self.model.works[worker_b.id, week, day, shift] for shift in self.get_shift_names_by_week_day(week, day)) * worker_pairs_constant return ( weekend_shift_balancing + + quadratic_shift_balancing + shift_balancing + worker_shift_balancing + night_shift_balancing