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

start pydanitification

Browse Source
This commit is contained in:
Ross
2022-05-26 15:38:35 +01:00
parent a8cf3e3460
commit c9ba2a098c
14 changed files with 767 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_general_balancing.py
+8 -8
View File
@@ -16,12 +16,12 @@ def generate_basic_rota(weeks_to_rota=10):
# Add a few workers
Rota.add_workers([
Worker(Rota, "worker1", "group1", 1),
Worker(Rota, "worker2", "group1", 1),
Worker(Rota, "worker3", "group2", 1),
#Worker(Rota, "worker4", "group2", 1),
#Worker(Rota, "worker5", "group2", 1),
#Worker(Rota, "worker6", "group2", 1, fte=50),
Worker(name="worker1", site="group1", grade=1),
Worker(name="worker2", site="group1", grade=1),
Worker(name="worker3", site="group2", grade=1),
#Worker(name="worker4", site="group2", grade=1),
#Worker(name="worker5", site="group2", grade=1),
#Worker(name="worker6", site="group2", grade=1, fte=50),
])
return Rota
@@ -201,7 +201,7 @@ class TestBalancing:
Rota = generate_basic_rota(10)
Rota.add_worker(
Worker(Rota, "worker4", "group3", 1),
Worker(name="worker4", site="group3", grade=1),
)
Rota.add_shifts(
@@ -242,7 +242,7 @@ class TestBalancing:
Rota = generate_basic_rota(10)
Rota.add_worker(
Worker(Rota, "worker4", "group3", 1),
Worker(name="worker4", site="group3", grade=1),
)
Rota.add_shifts(
test/test_nwds.py
+62 -61
View File
@@ -24,8 +24,8 @@ class TestDemoRota:
)
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1, nwd=["Mon"])
worker2 = Worker(self.Rota, "worker2", "group1", 1, nwd=["Fri"])
worker1 = Worker(name="worker1", site="group1", grade=1, nwds=[{"day": "Mon"}])
worker2 = Worker(name="worker2", site="group1", grade=1, nwds=[{"day": "Fri"}])
self.Rota.add_workers((worker1, worker2))
@@ -36,7 +36,7 @@ class TestDemoRota:
"d",
12.5,
days[:5],
balance_offset=10,
# balance_offset=10,
workers_required=1,
),
SingleShift(
@@ -48,7 +48,7 @@ class TestDemoRota:
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.build_and_solve(options={"ratio": 0.10})
self.Rota.export_rota_to_html("nwd")
@@ -78,8 +78,8 @@ class TestDemoRota:
)
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1, nwd=["Mon"])
worker2 = Worker(self.Rota, "worker2", "group1", 1, nwd=["Mon"])
worker1 = Worker(name="worker1", site="group1", grade=1, nwds=[{"day": "Mon"}])
worker2 = Worker(name="worker2", site="group1", grade=1, nwds=[{"day": "Mon"}])
self.Rota.add_workers((worker1, worker2))
@@ -114,10 +114,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=5)
# Add a few workers
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date": start_date, "end_date": d}],
)
worker2 = Worker(
self.Rota, "worker2", "group1", 1, nwd=[("Mon", d, self.Rota.rota_end_date)]
name="worker2",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date": d, "end_date": self.Rota.rota_end_date}],
)
self.Rota.add_workers((worker1, worker2))
@@ -140,6 +146,21 @@ class TestDemoRota:
assert self.Rota.results.solver.status == "ok"
for worker in self.Rota.workers:
shifts = self.Rota.get_worker_shift_list(worker)
# Convert shift to a string representation
shifts_string = "".join([i if i != "" else "-" for i in shifts])
if worker.name == "worker1":
for n in range(0,4):
assert shifts_string[0 + 7*n] == "-"
if worker.name == "worker2":
for n in range(5,9):
assert shifts_string[0 + 7*n] == "-"
def test_nwd_partial_overlay(self):
# Set up rota
weeks_to_rota = 10
@@ -154,10 +175,16 @@ class TestDemoRota:
d2 = start_date + datetime.timedelta(weeks=6)
# Add a few workers
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d2)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day":"Mon", "start_date":start_date, "end_date":d2}],
)
worker2 = Worker(
self.Rota, "worker2", "group1", 1, nwd=[("Mon", d, self.Rota.rota_end_date)]
name="worker2",
site="group1",
grade=1,
nwds=[{"day":"Mon", "start_date":d, "end_date":self.Rota.rota_end_date}],
)
self.Rota.add_workers((worker1, worker2))
@@ -190,25 +217,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=4)
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date":start_date, "end_date":d}],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
worker3 = Worker(
self.Rota,
"worker3",
"group1",
1,
worker3 = Worker(name="worker3", site="group1", grade=1,
)
worker4 = Worker(
self.Rota,
"worker4",
"group1",
1,
worker4 = Worker(name="worker4", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2, worker3, worker4))
@@ -255,25 +273,16 @@ class TestDemoRota:
d = start_date + datetime.timedelta(weeks=5)
worker1 = Worker(
self.Rota, "worker1", "group1", 1, nwd=[("Mon", start_date, d)]
name="worker1",
site="group1",
grade=1,
nwds=[{"day": "Mon", "start_date":start_date, "end_date":d}],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
worker3 = Worker(
self.Rota,
"worker3",
"group1",
1,
worker3 = Worker(name="worker3", site="group1", grade=1,
)
worker4 = Worker(
self.Rota,
"worker4",
"group1",
1,
worker4 = Worker(name="worker4", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2, worker3, worker4))
@@ -303,7 +312,7 @@ class TestDemoRota:
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.export_rota_to_html("nwd")
self.Rota.export_rota_to_html("nwd_block_force_split")
assert self.Rota.results.solver.status == "ok"
@@ -333,24 +342,16 @@ class TestDemoRota:
)
d = start_date + datetime.timedelta(weeks=5)
worker1 = Worker(
self.Rota,
"worker1",
"group1",
1,
nwd=[
("Mon", d, self.Rota.rota_end_date),
("Tue", d, self.Rota.rota_end_date),
("Wed", d, self.Rota.rota_end_date),
("Thu", d, self.Rota.rota_end_date),
("Fri", d, self.Rota.rota_end_date),
worker1 = Worker(name="worker1", site="group1", grade=1,
nwds=[
{"day": "Mon", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Tue", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Wed", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Thu", "start_date":d, "end_date":self.Rota.rota_end_date},
{"day": "Fri", "start_date":d, "end_date":self.Rota.rota_end_date},
],
)
worker2 = Worker(
self.Rota,
"worker2",
"group1",
1,
worker2 = Worker(name="worker2", site="group1", grade=1,
)
self.Rota.add_workers((worker1, worker2))
@@ -396,8 +397,8 @@ class TestDemoRota:
else:
assert week == "dddddww"
for week in weeks_from_list(shifts_string[:7 * 5 ]):
for week in weeks_from_list(shifts_string[: 7 * 5]):
if worker.name == "worker1":
assert week == "dddddww"
else:
assert week == "-----ww"
assert week == "-----ww"
test/test_remote.py
+181
View File
@@ -0,0 +1,181 @@
import pytest
from rota.shifts import NoWorkers, RotaBuilder, SingleShift, days
import datetime
from rota.workers import Worker
def setup_basic_rota():
weeks_to_rota = 10
start_date = datetime.date(2022, 3, 7)
return RotaBuilder(
start_date,
weeks_to_rota=weeks_to_rota,
)
class TestRemoteRotas:
def test_remote_fail(self):
Rota = setup_basic_rota()
Rota.add_workers(
[Worker(
name="worker1", site="group1", grade=1, remote_site="group1"
),
Worker(
name="worker2", site="group2", grade=1, remote_site="group2"
),]
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=1,
balance_offset=100,
force_as_block=False,
constraints=[("require_remote_site_presence_week", ("group2", 2))],
),
)
Rota.build_and_solve(options={"ratio": 0.000})
assert Rota.results.solver.status == "warning"
def test_remote_pass_week(self):
Rota = setup_basic_rota()
Rota.constraint_options["balance_bank_holidays"] = False
Rota.constraint_options["balance_shifts"] = False
Rota.constraint_options["balance_shifts_quadratic"] = False
Rota.constraint_options["balance_shifts_over_workers"] =True
Rota.constraint_options["balance_blocks"] = False
Rota.constraint_options["balance_weekends"] = False
Rota.constraint_options["balance_nights"] = False
Rota.constraint_options["minimse_shift_diffs"] = False
Rota.add_workers(
[Worker(
name="worker1", site="group2", grade=1, remote_site="group1"
),
Worker(
name="worker2", site="group2", grade=1, remote_site="group2"
),Worker(
name="worker3", site="group2", grade=1, remote_site="group2"
),]
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days[:3],
workers_required=1,
balance_offset=10,
force_as_block=True,
constraints=[("require_remote_site_presence_week", ("group2", 1))],
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days[3:],
workers_required=1,
balance_offset=10,
force_as_block=False,
#constraints=[("require_remote_site_presence_week", ("group2", 1))],
#constraint=["balance_shifts_over_workers"]
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("remote_pass_week")
assert Rota.results.solver.status == "ok"
for worker in Rota.workers:
shifts = Rota.get_worker_shift_list(worker)
# Convert shift to a string representation
shifts_string = "".join([i if i != "" else "-" for i in shifts])
if worker.site == "group1":
assert "a" not in shifts_string
total_shifts = Rota.get_workers_total_shifts()
shift_range = max(total_shifts.values()) - min(total_shifts.values())
assert shift_range <= 1
def test_remote_pass(self):
Rota = setup_basic_rota()
Rota.constraint_options["balance_bank_holidays"] = False
Rota.constraint_options["balance_shifts"] = False
Rota.constraint_options["balance_shifts_quadratic"] = False
Rota.constraint_options["balance_shifts_over_workers"] =True
Rota.constraint_options["balance_blocks"] = False
Rota.constraint_options["balance_weekends"] = False
Rota.constraint_options["balance_nights"] = False
Rota.constraint_options["minimse_shift_diffs"] = False
Rota.add_workers(
[Worker(
name="worker1", site="group2", grade=1, remote_site="group1"
),
Worker(
name="worker2", site="group2", grade=1, remote_site="group2"
),Worker(
name="worker3", site="group2", grade=1, remote_site="group2"
),]
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days[:3],
workers_required=1,
balance_offset=10,
force_as_block=False,
constraints=[("require_remote_site_presence", ("group2", 1))],
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days[3:],
workers_required=1,
balance_offset=10,
force_as_block=False,
#constraints=[("require_remote_site_presence_week", ("group2", 1))],
#constraint=["balance_shifts_over_workers"]
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("remote_pass")
assert Rota.results.solver.status == "ok"
for worker in Rota.workers:
shifts = Rota.get_worker_shift_list(worker)
# Convert shift to a string representation
shifts_string = "".join([i if i != "" else "-" for i in shifts])
if worker.site == "group1":
assert "a" not in shifts_string
total_shifts = Rota.get_workers_total_shifts()
shift_range = max(total_shifts.values()) - min(total_shifts.values())
assert shift_range <= 1
test/test_rota.py
+94 -57
View File
@@ -24,20 +24,20 @@ class TestDemoRota:
Rota.constraint_options["max_shifts_per_month"] = 31
Rota.constraint_options["constrain_time_off_after_nights"] = False
Rota.constraint_options["balance_nights_across_site"] = False
Rota.constraint_options["balance_shifts"] = True
Rota.constraint_options["balance_shifts_quadratic"] = True
Rota.constraint_options["balance_shifts_over_workers"] = True
Rota.constraint_options["balance_nights"] = False
Rota.constraint_options["minimise_shift_diffs"] = False
Rota.constraint_options["balance_blocks"] = False
# Rota.constraint_options["balance_weekends"] = False
Rota.constraint_options["balance_bank_holidays"] = False
# Add a few workers
worker1 = Worker(Rota, "worker1", "group1", 1)
worker2 = Worker(Rota, "worker2", "group1", 1)
worker3 = Worker(Rota, "worker3", "group1", 1)
worker4 = Worker(Rota, "worker4", "group1", 1)
worker5 = Worker(Rota, "worker5", "group2", 1, fte=60)
worker6 = Worker(Rota, "worker6", "group2", 1, fte=40)
worker1 = Worker(name= "worker1", site= "group1", grade= 1)
worker2 = Worker(name= "worker2", site= "group1", grade= 1)
worker3 = Worker(name= "worker3", site= "group1", grade= 1)
worker4 = Worker(name= "worker4", site= "group1", grade= 1)
worker5 = Worker(name= "worker5", site= "group2", grade= 1, fte=60)
worker6 = Worker(name= "worker6", site= "group2", grade= 1, fte=40)
Rota.add_workers((worker1, worker2, worker3, worker4, worker5, worker6))
@@ -207,14 +207,14 @@ class TestDemoRotaNights:
# Rota.constraint_options["balance_weekends"] = False
# Add a few workers
worker1 = Worker(Rota, "worker1", "group1", 1)
worker2 = Worker(Rota, "worker2", "group1", 1)
worker3 = Worker(Rota, "worker3", "group1", 1)
worker4 = Worker(Rota, "worker4", "group1", 1)
worker5 = Worker(Rota, "worker5", "group2", 1, fte=60)
worker6 = Worker(Rota, "worker6", "group2", 1, fte=40)
worker7 = Worker(Rota, "worker7", "group2", 1)
worker8 = Worker(Rota, "worker8", "group2", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
worker3 = Worker(name="worker3", site="group1", grade=1)
worker4 = Worker(name="worker4", site="group1", grade=1)
worker5 = Worker(name="worker5", site="group2", grade=1, fte=60)
worker6 = Worker(name="worker6", site="group2", grade=1, fte=40)
worker7 = Worker(name="worker7", site="group2", grade=1)
worker8 = Worker(name="worker8", site="group2", grade=1)
Rota.add_workers(
(worker1, worker2, worker3, worker4, worker5, worker6, worker7, worker8)
@@ -307,14 +307,14 @@ class TestDemoRotaClear:
)
Rota.constraint_options["max_shifts_per_month"] = 20
worker1 = Worker(Rota, "worker1", "group1", 1)
worker2 = Worker(Rota, "worker2", "group1", 1)
worker3 = Worker(Rota, "worker3", "group1", 1)
worker4 = Worker(Rota, "worker4", "group1", 1)
worker5 = Worker(Rota, "worker5", "group2", 1, fte=60)
worker6 = Worker(Rota, "worker6", "group2", 1, fte=40)
worker7 = Worker(Rota, "worker7", "group2", 1)
worker8 = Worker(Rota, "worker8", "group2", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
worker3 = Worker(name="worker3", site="group1", grade=1)
worker4 = Worker(name="worker4", site="group1", grade=1)
worker5 = Worker(name="worker5", site="group2", grade=1, fte=60)
worker6 = Worker(name="worker6", site="group2", grade=1, fte=40)
worker7 = Worker(name="worker7", site="group2", grade=1)
worker8 = Worker(name="worker8", site="group2", grade=1)
Rota.add_workers(
(worker1, worker2, worker3, worker4, worker5, worker6, worker7, worker8)
@@ -393,8 +393,8 @@ class TestDemoRotaShiftConstraints:
)
# Rota.constraint_options["max_shifts_per_week"] = 5
# Rota.constraint_options["max_shifts_per_month"] = 20
worker1 = Worker(Rota, "worker1", "group1", 1)
worker2 = Worker(Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
Rota.add_workers((worker1, worker2))
Rota.add_shifts(
@@ -409,7 +409,7 @@ class TestDemoRotaShiftConstraints:
)
Rota3Workers = deepcopy(Rota)
worker3 = Worker(Rota3Workers, "worker3", "group1", 1)
worker3 = Worker(name="worker3", site="group1", grade=1)
Rota3Workers.add_worker(worker3)
@@ -449,7 +449,7 @@ class TestDemoRotaShiftConstraints:
def test_max_shifts_per_week_extra_worker_pass(self):
self.Rota3Workers.constraint_options["max_shifts_per_week"] = 3
# worker3 = Worker(self.Rota, "worker3", "group1", 1)
# worker3 = Worker(name="worker3", site="group1", grade=1)
# self.Rota.add_worker(worker3)
self.Rota3Workers.build_and_solve()
@@ -466,12 +466,12 @@ class TestDemoRotaBalanceShiftSites:
)
# Rota.constraint_options["max_shifts_per_week"] = 5
# Rota.constraint_options["max_shifts_per_month"] = 20
worker1 = Worker(Rota, "worker1", "group1", 1)
worker2 = Worker(Rota, "worker2", "group1", 1)
worker3 = Worker(Rota, "worker3", "group2", 1)
worker4 = Worker(Rota, "worker4", "group2", 1)
worker5 = Worker(Rota, "worker5", "group3", 1)
worker6 = Worker(Rota, "worker6", "group3", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
worker3 = Worker(name="worker3", site="group2", grade=1)
worker4 = Worker(name="worker4", site="group2", grade=1)
worker5 = Worker(name="worker5", site="group3", grade=1)
worker6 = Worker(name="worker6", site="group3", grade=1)
Rota.add_workers((worker1, worker2, worker3, worker4))
Rota.add_workers((worker5, worker6))
@@ -564,6 +564,8 @@ class TestDemoRotaBalanceShiftSites:
self.Rota.constraint_options["constrain_time_off_after_nights"] = False
self.Rota.build_and_solve(options={"ratio": 0.1})
print("HELLO")
group_workers = self.Rota.get_workers_by_group()
for group in group_workers:
shift_patterns = []
@@ -589,12 +591,12 @@ class TestLimitConstraints:
)
# Rota.constraint_options["max_shifts_per_week"] = 5
# Rota.constraint_options["max_shifts_per_month"] = 20
worker1 = Worker(Rota, "worker1", "group1", 2, remote_site="group1")
worker2 = Worker(Rota, "worker2", "group1", 2, remote_site="group1")
worker3 = Worker(Rota, "worker3", "group1", 2, remote_site="group1")
worker4 = Worker(Rota, "worker4", "group3", 3, remote_site="group2")
worker5 = Worker(Rota, "worker5", "group3", 3, remote_site="group2")
worker6 = Worker(Rota, "worker6", "group3", 3, remote_site="group2")
worker1 = Worker(name="worker1", site="group1", grade=2, remote_site="group1")
worker2 = Worker(name="worker2", site="group1", grade=2, remote_site="group1")
worker3 = Worker(name="worker3", site="group1", grade=2, remote_site="group1")
worker4 = Worker(name="worker4", site="group3", grade=3, remote_site="group2")
worker5 = Worker(name="worker5", site="group3", grade=3, remote_site="group2")
worker6 = Worker(name="worker6", site="group3", grade=3, remote_site="group2")
Rota.add_workers((worker1, worker2, worker3, worker4))
Rota.add_workers((worker5, worker6))
@@ -847,18 +849,18 @@ class TestLimitConstraints:
with pytest.raises(ValueError):
self.Rota.build_and_solve(options={"ratio": 0.1})
def test_constraint_require_remote_site_presence(self):
def test_constraint_require_remote_site_presence_week(self):
self.Rota.shifts = []
self.Rota.add_shifts(
SingleShift(
("group1", "group2", "group3"),
"weekday_night",
"night",
12.5,
days,
balance_offset=40,
workers_required=2,
force_as_block=True,
constraints=[("require_remote_site_presence", ("group1", 2))],
constraints=[("require_remote_site_presence_week", ("group1", 2))],
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
@@ -876,29 +878,33 @@ class TestLimitConstraints:
if group != "group1":
limit = 0
for day_shifts in zipped_lists:
assert day_shifts.count("weekday_night") == limit
assert day_shifts.count("night") == limit
assert self.Rota.results.solver.status == "ok"
assert self.Rota.results.solver.termination_condition == "optimal"
def test_constraint_require_remote_site_presence2(self):
def test_constraint_require_remote_site_presence_week2(self):
self.Rota.constraint_options["minimise_shift_diffs"] = False
self.Rota.constraint_options["balance_shifts_quadratic"] = False
self.Rota.constraint_options["balance_shift"] = False
self.Rota.constraint_options["balance_nights_across_sites"] = True
self.Rota.shifts = []
self.Rota.add_shifts(
SingleShift(
("group1", "group2", "group3"),
"weekday_night",
"night",
12.5,
days,
balance_offset=40,
balance_offset=20,
workers_required=3,
force_as_block=True,
constraints=[("require_remote_site_presence", ("group2", 2))],
constraints=[("require_remote_site_presence_week", ("group2", 2))],
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.export_rota_to_html("remote2")
group_workers = self.Rota.get_workers_by_group()
group_workers = self.Rota.get_workers_by_remote_group()
for group in group_workers:
shift_patterns = []
for w in group_workers[group]:
@@ -908,11 +914,42 @@ class TestLimitConstraints:
if group == "group2":
for day_shifts in zipped_lists:
assert day_shifts.count("weekday_night") >= 2
assert day_shifts.count("night") >= 2
assert self.Rota.results.solver.status == "ok"
assert self.Rota.results.solver.termination_condition == "optimal"
def test_constraint_require_remote_site_presence_week3(self):
self.Rota.shifts = []
self.Rota.add_shifts(
SingleShift(
("group1", "group2", "group3"),
"night",
12.5,
days,
balance_offset=20,
workers_required=3,
force_as_block=True,
constraints=[("require_remote_site_presence_week", ("group2", 1))],
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
self.Rota.export_rota_to_html("remote3")
group_workers = self.Rota.get_workers_by_remote_group()
for group in group_workers:
shift_patterns = []
for w in group_workers[group]:
shift_patterns.append(self.Rota.get_worker_shift_list(w))
zipped_lists = list(zip(*shift_patterns))
if group == "group2":
for day_shifts in zipped_lists:
assert day_shifts.count("night") >= 1
assert self.Rota.results.solver.status == "ok"
assert self.Rota.results.solver.termination_condition == "optimal"
# class TestNoWorkerRota:
# weeks_to_rota = 10
@@ -942,10 +979,10 @@ class TestNightUnavailable:
# Add a few workers
worker1 = Worker(
Rota, "worker1", "group1", 1, not_available_to_work=((datetime.datetime.strptime("15/03/22", "%d/%m/%y").date(), "****"),)
name="worker1", site="group1", grade=1, not_available_to_work=[{ "date": datetime.datetime.strptime("15/03/22", "%d/%m/%y").date(), "reason" : "****" },]
)
worker2 = Worker(
Rota, "worker2", "group1", 1, not_available_to_work=((datetime.datetime.strptime("14/03/22", "%d/%m/%y").date(), "****"),)
name="worker2", site="group1", grade=1, not_available_to_work=[ { "date": datetime.datetime.strptime("14/03/22", "%d/%m/%y").date(), "reason": "****" } ]
)
Rota.add_workers((worker1, worker2))
@@ -1007,10 +1044,10 @@ class TestNightUnavailable:
def test_assign_split(self):
self.Rota.shifts = []
worker3 = Worker(
self.Rota, "worker3", "group1", 1, not_available_to_work=((datetime.datetime.strptime("13/03/22", "%d/%m/%y").date(), "****"),)
name="worker3", site="group1", grade=1, not_available_to_work=({"date":datetime.datetime.strptime("13/03/22", "%d/%m/%y").date()},)
)
worker4 = Worker(
self.Rota, "worker4", "group1", 1, not_available_to_work=((datetime.datetime.strptime("12/03/22", "%d/%m/%y").date(), "****"),)
name="worker4", site="group1", grade=1, not_available_to_work=({"date":datetime.datetime.strptime("12/03/22", "%d/%m/%y").date()},)
)
self.Rota.add_workers((worker3, worker4))
@@ -1033,10 +1070,10 @@ class TestNightUnavailable:
# def test_assign_split_night_constraint(self):
# self.Rota.shifts = []
# worker3 = Worker(
# self.Rota, "worker3", "group1", 1, not_available_to_work=((datetime.datetime.strptime("13/03/22", "%d/%m/%y").date(), "****"),)
# self.Rota, name="worker3", site="group1", grade=1, not_available_to_work=((datetime.datetime.strptime("13/03/22", "%d/%m/%y").date(), "****"),)
# )
# worker4 = Worker(
# self.Rota, "worker4", "group1", 1, not_available_to_work=((datetime.datetime.strptime("12/03/22", "%d/%m/%y").date(), "****"),)
# self.Rota, name="worker4", site="group1", grade=1, not_available_to_work=((datetime.datetime.strptime("12/03/22", "%d/%m/%y").date(), "****"),)
# )
# self.Rota.add_workers((worker3, worker4))
#
@@ -1052,4 +1089,4 @@ class TestNightUnavailable:
if __name__ == "__main__":
t = TestLimitConstraints()
t.test_constraint_require_remote_site_presence()
t.test_constraint_require_remote_site_presence_week()
test/test_shifts.py
+3 -6
View File
@@ -18,8 +18,8 @@ def generate_basic_rota(weeks_to_rota=10):
# Add a few workers
Rota.add_workers(
[
Worker(Rota, "worker1", "group1", 1),
Worker(Rota, "worker2", "group1", 1),
Worker(name="worker1", site="group1", grade=1),
Worker(name="worker2", site="group1", grade=1),
]
)
@@ -43,10 +43,7 @@ class TestShifts:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
),
)
test/test_weekend_padding.py
+19 -19
View File
@@ -23,10 +23,10 @@ class TestDemoRota:
self.Rota.constraint_options["balance_weekends"] = True
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker3 = Worker(self.Rota, "worker3", "group1", 1)
worker4 = Worker(self.Rota, "worker4", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
worker3 = Worker(name="worker3", site="group1", grade=1)
worker4 = Worker(name="worker4", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2, worker3, worker4))
@@ -86,11 +86,11 @@ class TestDemoRota:
self.Rota.constraint_options["balance_weekends"] = True
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker3 = Worker(self.Rota, "worker3", "group1", 1)
worker4 = Worker(self.Rota, "worker4", "group1", 1)
worker5 = Worker(self.Rota, "worker5", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
worker3 = Worker(name="worker3", site="group1", grade=1)
worker4 = Worker(name="worker4", site="group1", grade=1)
worker5 = Worker(name="worker5", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2, worker3, worker4, worker5))
@@ -151,8 +151,8 @@ class TestDemoRota:
self.Rota.constraint_options["prevent_monday_and_tuesday_after_full_weekends"] = ["group1",]
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2))
@@ -203,8 +203,8 @@ class TestDemoRota:
self.Rota.constraint_options["prevent_monday_and_tuesday_after_full_weekends"] = ["group1",]
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2))
@@ -251,8 +251,8 @@ class TestDemoRota:
self.Rota.constraint_options["prevent_monday_after_full_weekends"] = ["group1",]
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2))
@@ -310,8 +310,8 @@ class TestDemoRota:
self.Rota.constraint_options["prevent_monday_after_full_weekends"] = ["group1",]
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2))
@@ -360,8 +360,8 @@ class TestDemoRota:
self.Rota.constraint_options["prevent_monday_after_full_weekends"] = ["group1",]
# Add a few workers
worker1 = Worker(self.Rota, "worker1", "group1", 1)
worker2 = Worker(self.Rota, "worker2", "group1", 1)
worker1 = Worker(name="worker1", site="group1", grade=1)
worker2 = Worker(name="worker2", site="group1", grade=1)
self.Rota.add_workers((worker1, worker2))
test/test_worker_requests.py
+27 -63
View File
@@ -18,8 +18,8 @@ def generate_basic_rota(weeks_to_rota=10):
# Add a few workers
Rota.add_workers(
[
Worker(Rota, "worker1", "group1", 1),
Worker(Rota, "worker2", "group1", 1),
Worker(name="worker1", site="group1", grade=1),
Worker(name="worker2", site="group1", grade=1),
]
)
@@ -43,11 +43,8 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 5))),
name="worker3", site="group1", grade=1,
pref_not_to_work=[{"date": d} for d in date_generator(datetime.date(2022, 3, 7), 5)],
),
)
@@ -86,11 +83,8 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 55))),
name="worker3", site="group1", grade=1,
pref_not_to_work=[{"date": d} for d in date_generator(datetime.date(2022, 3, 7), 55)],
),
)
@@ -127,11 +121,8 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 70))),
name="worker3", site="group1", grade=1,
pref_not_to_work=[{"date": d} for d in date_generator(datetime.date(2022, 3, 7), 70)],
),
)
@@ -170,13 +161,10 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
not_available_to_work=(
[
(i, "NOT AROUND")
{"date": i, "reason": "NOT AROUND"}
for i in list(date_generator(datetime.date(2022, 3, 7), 23))
]
),
@@ -218,13 +206,10 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
not_available_to_work=(
[
(i, "NOT AROUND")
{"date": i, "reason": "NOT AROUND"}
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
@@ -257,17 +242,14 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
not_available_to_work=(
[
(i, "NOT AROUND")
{"date":i, "reason":"NOT AROUND"}
for i in list(date_generator(datetime.date(2022, 3, 7), 23))
]
),
pref_not_to_work=[datetime.date(2022, 5, 15)],
pref_not_to_work=[{"date":datetime.date(2022, 5, 15)}],
),
)
@@ -309,25 +291,19 @@ class TestWorkerRequests:
Rota.add_workers(
[Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
not_available_to_work=(
[
(i, "NOT AROUND")
{"date": i, "reason": "NOT AROUND"}
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
),
Worker(
Rota,
"worker4",
"group1",
1,
name="worker4", site="group1", grade=1,
not_available_to_work=(
[
(i, "NOT AROUND")
{"date": i, "reason": "NOT AROUND"}
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
@@ -359,25 +335,19 @@ class TestWorkerRequests:
Rota.add_workers(
[Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
work_requests=(
[
(i, "a")
{"date": i, "shift": "a"}
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
),
Worker(
Rota,
"worker4",
"group1",
1,
name="worker4", site="group1", grade=1,
work_requests=(
[
(i, "a")
{"date": i, "shift": "a"}
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
@@ -419,13 +389,10 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
name="worker3", site="group1", grade=1,
work_requests=(
[
(i, "b")
{"date": i, "shift": "b"}
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
@@ -482,13 +449,10 @@ class TestWorkerRequests:
Rota.add_worker(
Worker(
Rota,
"worker4",
"group1",
1,
name="worker4", site="group1", grade=1,
work_requests=(
[
(i, "d")
{"date": i, "shift": "d"}
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
test/test_workers.py
+106 -78
View File
@@ -2,7 +2,6 @@ import pytest
from rota.shifts import NoWorkers, RotaBuilder, SingleShift, days
import datetime
from rota.workers import Worker
@@ -41,10 +40,10 @@ class TestWorkers:
Rota = setup_basic_rota()
workers = []
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100))
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100))
workers.append(Worker(Rota, "worker3", "group2", 1, fte=50))
workers.append(Worker(Rota, "worker4", "group2", 1, fte=50))
workers.append(Worker(name="worker1", site="group1", grade=1, fte=100))
workers.append(Worker(name="worker1", site="group1", grade=1, fte=100))
workers.append(Worker(name="worker3", site="group2", grade=1, fte=50))
workers.append(Worker(name="worker4", site="group2", grade=1, fte=50))
Rota.add_workers(workers)
@@ -81,36 +80,48 @@ class TestWorkers:
workers = []
workers.append(
Worker(Rota, "worker1", "group1", 1, fte=100, end_date=worker1_end_date)
)
workers.append(
Worker(Rota, "worker2", "group1", 1, fte=100, start_date=worker2_start_date)
Worker(
name="worker1",
site="group1",
grade=1,
fte=100,
end_date=worker1_end_date,
)
)
workers.append(
Worker(
Rota,
"worker3",
"group2",
1,
name="worker2",
site="group1",
grade=1,
fte=100,
start_date=worker2_start_date,
)
)
workers.append(
Worker(
name="worker3",
site="group2",
grade=1,
fte=100,
start_date=worker3_start_date,
end_date=worker3_end_date,
)
)
workers.append(Worker(Rota, "worker4", "group2", 1, fte=50))
workers.append(Worker(Rota, "worker5", "group2", 1, fte=50, nwd=["Mon", "Tue"]))
workers.append(Worker(name="worker4", site="group2", grade=1, fte=50))
workers.append(
Worker(name="worker5", site="group2", grade=1, fte=50, nwd=["Mon", "Tue"])
)
workers.append(
Worker(
Rota,
"worker6",
"group3",
1,
name="worker6",
site="group3",
grade=1,
fte=100,
start_date=start_date + datetime.timedelta(weeks=weeks_to_rota),
)
)
workers.append(
Worker(Rota, "worker7", "group3", 1, fte=50, end_date=start_date)
Worker(name="worker7", site="group3", grade=1, fte=50, end_date=start_date)
)
Rota.add_workers(workers)
@@ -131,6 +142,7 @@ class TestWorkers:
# All workers should have an adjusted fte of 50 %
for worker in Rota.get_workers():
# Except those in group3
if worker.site == "group3":
assert worker.fte_adj == 0
assert Rota.get_worker_shift_list(worker).count("d") == 0
@@ -145,13 +157,20 @@ class TestWorkers:
assert Rota.get_worker_shift_list(worker).count("d") == 10
if worker.name == "worker1":
assert Rota.get_worker_shift_list_string(worker).endswith("-"*(Rota.rota_days_length//2))
assert Rota.get_worker_shift_list_string(worker).endswith(
"-" * (Rota.rota_days_length // 2)
)
if worker.name == "worker2":
assert Rota.get_worker_shift_list_string(worker).startswith("-"*(Rota.rota_days_length//2))
assert Rota.get_worker_shift_list_string(worker).startswith(
"-" * (Rota.rota_days_length // 2)
)
if worker.name == "worker3":
assert Rota.get_worker_shift_list_string(worker).startswith("-"*(Rota.rota_days_length//4))
assert Rota.get_worker_shift_list_string(worker).endswith("-"*(Rota.rota_days_length//4))
assert Rota.get_worker_shift_list_string(worker).startswith(
"-" * (Rota.rota_days_length // 4)
)
assert Rota.get_worker_shift_list_string(worker).endswith(
"-" * (Rota.rota_days_length // 4)
)
assert Rota.results.solver.status == "ok"
assert Rota.results.solver.termination_condition == "optimal"
@@ -168,87 +187,96 @@ class TestWorkers:
)
worker1_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"First half OOP",
)
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"reason": "First half OOP",
}
]
worker2_oop = [
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
Rota.rota_end_date,
"First half OOP",
)
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": Rota.rota_end_date,
"reason": "First half OOP",
}
]
worker3_start_date = start_date + datetime.timedelta(weeks=weeks_to_rota / 4)
worker3_oop = [
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date + datetime.timedelta(weeks=3 * weeks_to_rota / 4),
"Quarter oop",
)
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date + datetime.timedelta(weeks=3 * weeks_to_rota / 4),
"reason": "Quarter oop",
}
]
worker4_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 4),
"Quarter oop",
),
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 4),
"reason": "Quarter oop",
},
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date
+ datetime.timedelta(weeks=weeks_to_rota / 2)
+ datetime.timedelta(weeks=weeks_to_rota / 4),
"Quarter oop 2",
),
"reason": "Quarter oop 2",
},
]
workers = []
workers.append(Worker(Rota, "worker1", "group1", 1, fte=100, oop=worker1_oop))
workers.append(Worker(Rota, "worker2", "group1", 1, fte=100, oop=worker2_oop))
workers.append(
Worker(name="worker1", site="group1", grade=1, fte=100, oop=worker1_oop)
)
workers.append(
Worker(name="worker2", site="group1", grade=1, fte=100, oop=worker2_oop)
)
workers.append(
Worker(
Rota,
"worker3",
"group2",
1,
name="worker3",
site="group2",
grade=1,
fte=100,
start_date=worker3_start_date,
oop=worker3_oop,
)
)
workers.append(Worker(Rota, "worker4", "group2", 1, oop=worker4_oop))
workers.append(Worker(Rota, "worker5", "group2", 1, fte=50, nwd=["Mon", "Tue"]))
workers.append(Worker(name="worker4", site="group2", grade=1, oop=worker4_oop))
workers.append(
Worker(name="worker5", site="group2", grade=1, fte=50, nwd=["Mon", "Tue"])
)
worker6_oop = [
(
start_date,
start_date + datetime.timedelta(weeks=weeks_to_rota / 6),
"oop",
),
(
start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
start_date + datetime.timedelta(weeks=weeks_to_rota / 2)
{
"start_date": start_date,
"end_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 6),
"reason": "oop",
},
{
"start_date": start_date + datetime.timedelta(weeks=weeks_to_rota / 2),
"end_date": start_date
+ datetime.timedelta(weeks=weeks_to_rota / 2)
+ datetime.timedelta(weeks=weeks_to_rota / 3),
" oop 2",
),
"reason": " oop 2",
},
]
worker7_oop = [
(
start_date-datetime.timedelta(weeks=1),
Rota.rota_end_date,
"oop",
),
{
"start_date": start_date - datetime.timedelta(weeks=1),
"end_date": Rota.rota_end_date,
"reason": "oop",
},
]
workers.append(Worker(Rota, "worker6", "group2", 1, fte=100, oop=worker6_oop))
workers.append(Worker(Rota, "worker7", "group3", 1, fte=100, oop=worker7_oop))
workers.append(
Worker(name="worker6", site="group2", grade=1, fte=100, oop=worker6_oop)
)
workers.append(
Worker(name="worker7", site="group3", grade=1, fte=100, oop=worker7_oop)
)
Rota.add_workers(workers)
@@ -274,8 +302,8 @@ class TestWorkers:
assert worker.fte_adj == pytest.approx(50, 2)
if worker.fte == 100:
assert worker.proportion_rota_to_work == pytest.approx(0.5, 0.2)
assert worker.days_to_work == pytest.approx(35, 1)
assert worker.proportion_rota_to_work == pytest.approx(0.5, 0.2)
assert worker.days_to_work == pytest.approx(35, 1)
assert Rota.get_worker_shift_list(worker).count("d") in (8, 9)