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

fix shift solver (objective didn't seem to be used)

Browse Source
This commit is contained in:
Ross
2024-12-31 22:51:26 +00:00
parent f0b9ee0ebc
commit 9af01a3415
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rota/shifts.py
+3 -2
View File
@@ -2389,7 +2389,7 @@ class RotaBuilder(object):
shift_balancing = 0 shift_balancing = 0
if self.constraint_options["balance_shifts_quadratic"]: if self.constraint_options["balance_shifts_quadratic"]:
shift_balancing = sum( quadratic_shift_balancing = sum(
balance_modifier_constant balance_modifier_constant
* ( * (
self.model.shift_count_t1[worker.id, shift.name] self.model.shift_count_t1[worker.id, shift.name]
@@ -2399,7 +2399,7 @@ class RotaBuilder(object):
for shift in self.get_shifts() for shift in self.get_shifts()
) )
else: else:
shift_balancing = 0 quadratic_shift_balancing = 0
if self.constraint_options["minimise_shift_diffs"]: if self.constraint_options["minimise_shift_diffs"]:
shift_diff_modifier_constant = 10 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 # 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 ( return (
weekend_shift_balancing weekend_shift_balancing
+ quadratic_shift_balancing
+ shift_balancing + shift_balancing
+ worker_shift_balancing + worker_shift_balancing
+ night_shift_balancing + night_shift_balancing