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_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()