- {json.dumps(self.constraint_options, indent=4)}
+ {json.dumps({k: _pydantic_to_dict(v) for k, v in self.constraint_options.items()}, indent=4)}
@@ -4222,6 +4289,28 @@ class RotaBuilder(object):
return shifts
+ def get_shift_worker_list(self, shift_name: str) -> List[set[Worker]]:
+ """
+ Returns a list of workers assigned to a specific shift.
+
+ Args:
+ shift_name (str): The name of the shift.
+
+ Returns:
+ List[Worker]: List of workers assigned to the specified shift.
+ """
+ shift_list = []
+ for week, day in self.get_week_day_combinations():
+ workers: set = set()
+ for worker in self.workers:
+ if self.model.works[worker.id, week, day, shift_name].value > 0.5:
+ workers.add(worker)
+
+ shift_list.append(workers)
+
+ return shift_list
+
+
def get_worker_shift_list(self, worker: Worker, include_locums=False, search_multiple_assignments=False) -> List:
"""
This function returns a list of shifts assigned to a worker for each week and day.
diff --git a/rota/workers.py b/rota/workers.py
index 79855ae..766cd5b 100644
--- a/rota/workers.py
+++ b/rota/workers.py
@@ -237,7 +237,7 @@ class Worker(BaseModel):
end_oop_date = datetime.datetime.strptime(end_oop, "%d/%m/%y").date()
if start_oop_date >= end_oop_date:
- raise ValueError("End OOP date must be after start date")
+ raise ValueError(f"End OOP date must be after start date [{self.name} - Start date: {self.start_date} / End date: {self.end_date}]")
# ignore oops if they finish before the rota (or worker) start date
if end_oop_date > self.calculated_start_date:
diff --git a/test/rota_constraints/test_summed_shift_grade_constraints.py b/test/rota_constraints/test_summed_shift_grade_constraints.py
new file mode 100644
index 0000000..40754f2
--- /dev/null
+++ b/test/rota_constraints/test_summed_shift_grade_constraints.py
@@ -0,0 +1,94 @@
+import datetime
+import pytest
+from rota.shifts import InvalidShift, NoWorkers, RotaBuilder, SingleShift, days, MinSummedGradeByShiftsPerDayConstraint
+
+from rota.workers import Worker
+
+import itertools
+
+
+def generate_basic_rota(weeks_to_rota=9):
+ start_date = datetime.date(2022, 3, 7)
+
+ Rota = RotaBuilder(
+ start_date,
+ weeks_to_rota=weeks_to_rota,
+ )
+
+ # Add a few workers
+ Rota.add_workers(
+ [
+ Worker(name="worker1", site="group1", grade=1),
+ Worker(name="worker2", site="group1", grade=2),
+ Worker(name="worker3", site="group1", grade=3),
+ Worker(name="worker4", site="group1", grade=1),
+ Worker(name="worker5", site="group1", grade=2),
+ Worker(name="worker6", site="group1", grade=3),
+ ]
+ )
+
+ return Rota
+
+
+def test_summed_shift_grade_constraints():
+ Rota = generate_basic_rota(5)
+
+ Rota.add_shifts(
+ SingleShift(
+ sites=("group1",), name="a", length=12.5, days=days,
+ workers_required=1,
+ force_as_block=False,
+ ),
+ SingleShift(
+ sites=("group1",), name="b", length=12.5, days=days,
+ workers_required=1,
+ force_as_block=False,
+ ),
+ )
+
+ # Add summed shift grade constraints
+ Rota.constraint_options["min_summed_grade_by_shifts_per_day"].append(
+ MinSummedGradeByShiftsPerDayConstraint(
+ shifts=["a", "b"],
+ min_grade_sum=4,
+ ),
+ )
+
+ Rota.build_and_solve(options={"ratio": 0.000})
+
+ assert Rota.results.solver.status == "ok"
+
+ Rota.export_rota_to_html("summed_shift_grade_constraints", folder="tests")
+
+ a_grades = []
+ b_grades = []
+
+ for shift, shift_timetable in Rota.get_shift_timetable_by_week().items():
+ for week, week_timetable in shift_timetable.items():
+ for day, workers in week_timetable.items():
+ if shift == "a":
+ for worker in workers:
+ a_grades.append(worker.grade)
+ elif shift == "b":
+ for worker in workers:
+ b_grades.append(worker.grade)
+
+ # Check that the minimum summed grade is respected
+ summed_grades = [a + b for a, b in zip(a_grades, b_grades)]
+ for summed_grade in summed_grades:
+ assert summed_grade >= 4, f"Summed grade {summed_grade} is less than 4"
+
+ Rota.constraint_options["min_summed_grade_by_shifts_per_day"] = [
+ MinSummedGradeByShiftsPerDayConstraint(
+ shifts=["a", "b"],
+ min_grade_sum=5,
+ ),
+ ]
+
+ Rota.build_and_solve(options={"ratio": 0.000})
+ assert Rota.results.solver.status == "ok"
+
+ for worker in Rota.get_workers():
+ if worker.grade == 1:
+ assert Rota.get_worker_shift_list(worker).count("a") == 0, f"Worker {worker.name} with grade 1 should not have shift 'a'"
+ assert Rota.get_worker_shift_list(worker).count("b") == 0, f"Worker {worker.name} with grade 1 should not have shift 'b'"
diff --git a/test/test_limit_constraints.py b/test/test_limit_constraints.py
index 7736f49..43245be 100644
--- a/test/test_limit_constraints.py
+++ b/test/test_limit_constraints.py
@@ -60,17 +60,17 @@ def test_constraint_limit_grades2(limit_constraint_rota):
balance_offset=40,
workers_required=4,
force_as_block=True,
- constraint=[{"name": "limit_grade_number", "options": {3: 2}}],
+ constraint=[{"name": "limit_grade_number", "options": {3: 1}}],
),
)
Rota.constraint_options["balance_shifts_quadratic"] = True
Rota.build_and_solve(options={"ratio": 0.1})
- Rota.export_rota_to_html("test9")
+ Rota.export_rota_to_html("test9", folder="tests")
grade_workers = Rota.get_workers_by_grade()
for grade in grade_workers:
shift_patterns = [Rota.get_worker_shift_list(w) for w in grade_workers[grade]]
zipped_lists = list(zip(*shift_patterns))
- limit = 2 if grade == 3 else 2
+ limit = 1 if grade == 3 else 3
for day_shifts in zipped_lists:
assert day_shifts.count("weekday_night") == limit
assert Rota.results.solver.status == "ok"
diff --git a/test/test_weekend_padding.py b/test/test_weekend_padding.py
index 3b5d816..701e386 100644
--- a/test/test_weekend_padding.py
+++ b/test/test_weekend_padding.py
@@ -46,7 +46,7 @@ class TestDemoRota:
self.Rota.build_and_solve(options={"ratio": 0.00})
- self.Rota.export_rota_to_html("balance_weekend")
+ self.Rota.export_rota_to_html("balance_weekend", folder="tests")
assert self.Rota.results.solver.status == "ok"
assert self.Rota.results.solver.termination_condition == "optimal"