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

further tests and fixes

Browse Source
This commit is contained in:
Ross
2022-05-18 17:20:28 +01:00
parent f887257a55
commit a8cf3e3460
7 changed files with 953 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test_general_balancing.py
+280
View File
@@ -0,0 +1,280 @@
import datetime
import pytest
from rota.shifts import NoWorkers, RotaBuilder, SingleShift, days
from rota.workers import Worker
def generate_basic_rota(weeks_to_rota=10):
start_date = datetime.date(2022, 3, 7)
Rota = RotaBuilder(
start_date,
weeks_to_rota=weeks_to_rota,
)
Rota.constraint_options["balance_weekends"] = True
# 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),
])
return Rota
class TestBalancing:
def test_basic_balancing(self):
Rota = generate_basic_rota()
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
balance_offset=2,
workers_required=1,
force_as_block=False
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days,
balance_offset=2,
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.001})
Rota.export_rota_to_html("basic_balancing")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (22, 23, 24, 25)
assert worker_shifts["b"] in (22, 23, 24, 25)
def test_weighted_shift_balancing(self):
Rota = generate_basic_rota(20)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
balance_weighting=4,
workers_required=1,
force_as_block=False,
constraints=["preclear2", "postclear2"],
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days,
workers_required=1,
force_as_block=False
),
SingleShift(
("group1", "group2"),
"c",
12.5,
days[0],
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.001})
Rota.export_rota_to_html("basic_balancing_weighted_shifts")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46,47,48)
#assert worker_shifts["b"] in (22, 23, 24, 25)
def test_weighted_shift_balancing2(self):
Rota = generate_basic_rota(23)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
#balance_weighting=4,
workers_required=1,
force_as_block=False,
#constraints=["preclear2", "postclear2"],
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days,
balance_weighting=4,
workers_required=1,
force_as_block=False
),
SingleShift(
("group1", "group2"),
"c",
12.5,
days[0],
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.001})
Rota.export_rota_to_html("basic_balancing_weighted_shifts2")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
#assert worker_shifts["a"] in (46,47,48)
#assert worker_shifts["c"] in (46,47,48)
assert worker_shifts["b"] in (52,53,54,55)
def test_weighted_shift_balancing3(self):
Rota = generate_basic_rota(23)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
#balance_weighting=4,
workers_required=1,
force_as_block=False,
#constraints=["preclear2", "postclear2"],
),
SingleShift(
("group1", "group2"),
"b",
12.5,
days,
balance_weighting=4,
workers_required=1,
force_as_block=False
),
SingleShift(
("group1", "group2"),
"c",
12.5,
days[0],
balance_weighting=4,
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("basic_balancing_weighted_shifts3")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
#assert worker_shifts["a"] in (46,47,48)
assert worker_shifts["c"] in (7,8)
assert worker_shifts["b"] in (52,53,54,55)
def test_weighted_shift_balancing4(self):
Rota = generate_basic_rota(10)
Rota.add_worker(
Worker(Rota, "worker4", "group3", 1),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
balance_offset=99,
balance_weighting=8,
workers_required=2,
force_as_block=False,
#constraints=["preclear2", "postclear2"],
),
SingleShift(
("group2","group3"),
"b",
12.5,
days,
balance_offset=99,
#balance_weighting=4,
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("basic_balancing_weighted_shifts4")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (0, 46,47,48)
def test_weighted_shift_balancing5(self):
Rota = generate_basic_rota(10)
Rota.add_worker(
Worker(Rota, "worker4", "group3", 1),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
balance_offset=99,
#balance_weighting=8,
workers_required=2,
force_as_block=False,
#constraints=["preclear2", "postclear2"],
),
SingleShift(
("group2","group3"),
"b",
12.5,
days,
balance_offset=99,
balance_weighting=4,
workers_required=1,
force_as_block=False
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("basic_balancing_weighted_shifts5")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["b"] in (0, 35)
test/test_rota.py
+43 -47
View File
@@ -227,7 +227,6 @@ class TestDemoRotaNights:
"night_weekday",
12.5,
days[:4],
balance_offset=10,
workers_required=1,
constraints=["preclear2", "postclear2"],
# constraints=["night"],
@@ -241,7 +240,6 @@ class TestDemoRotaNights:
"night_weekend",
12.5,
days[4:],
balance_offset=40,
# balance_weighting=0.5
constraints=["preclear2", "postclear2"],
# constraints=["night"],
@@ -252,7 +250,6 @@ class TestDemoRotaNights:
"twilight",
12.5,
days[:5],
balance_offset=40,
# balance_weighting=0.5
workers_required=2,
# constraints=["preclear2", "postclear2"],
@@ -268,37 +265,36 @@ class TestDemoRotaNights:
Rota.build_workers()
Rota.build_model()
print(Rota.get_worker_details())
for w in Rota.get_workers():
print(w)
print(w.get_shift_targets())
solver_options = {"ratio": 0.1, "seconds": 1000, "threads": 10}
solver_options = {"ratio": 0.00, "seconds": 1000, "threads": 10}
Rota.solve_model(options=solver_options)
# print(Rota.get_worker_details())
# optimizer = SolverFactory('cbc')
# result = optimizer.solve(prob,tee=True)
# result.Solver.Status = SolverStatus.warning
# prob.solutions.load_from(result)
worker_timetable_brief = Rota.get_worker_timetable_brief(
show_prefs=False, show_unavailable=False
)
print(worker_timetable_brief)
print(Rota.get_shift_summary_dict())
Rota.export_rota_to_html("test3")
print(Rota.get_worker_shift_list(worker1))
def test_start_date(self):
assert self.Rota.start_date == self.start_date
def test_night_assignment(self):
shift_summary = self.Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = self.Rota.get_worker_by_name(worker_name)
if worker.fte == 40:
assert worker_shifts["night_weekday"] in (0,4)
assert worker_shifts["night_weekend"] in (0,3)
elif worker.fte == 60:
assert worker_shifts["night_weekday"] in (0,4,8)
assert worker_shifts["night_weekend"] in (0,3,6)
else:
assert worker_shifts["night_weekday"] in (4,8)
assert worker_shifts["night_weekend"] in (3,6)
class TestDemoRotaClear:
weeks_to_rota = 10
start_date = datetime.date(2022, 3, 7)
@@ -946,10 +942,10 @@ class TestNightUnavailable:
# Add a few workers
worker1 = Worker(
Rota, "worker1", "group1", 1, not_available_to_work=(("15/03/22", "****"),)
Rota, "worker1", "group1", 1, not_available_to_work=((datetime.datetime.strptime("15/03/22", "%d/%m/%y").date(), "****"),)
)
worker2 = Worker(
Rota, "worker2", "group1", 1, not_available_to_work=(("14/03/22", "****"),)
Rota, "worker2", "group1", 1, not_available_to_work=((datetime.datetime.strptime("14/03/22", "%d/%m/%y").date(), "****"),)
)
Rota.add_workers((worker1, worker2))
@@ -1011,10 +1007,10 @@ class TestNightUnavailable:
def test_assign_split(self):
self.Rota.shifts = []
worker3 = Worker(
self.Rota, "worker3", "group1", 1, not_available_to_work=(("13/03/22", "****"),)
self.Rota, "worker3", "group1", 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=(("12/03/22", "****"),)
self.Rota, "worker4", "group1", 1, not_available_to_work=((datetime.datetime.strptime("12/03/22", "%d/%m/%y").date(), "****"),)
)
self.Rota.add_workers((worker3, worker4))
@@ -1034,25 +1030,25 @@ class TestNightUnavailable:
for worker in summary:
assert summary[worker]["night_weekend"] == 15
def test_assign_split_night_constraint(self):
self.Rota.shifts = []
worker3 = Worker(
self.Rota, "worker3", "group1", 1, not_available_to_work=(("13/03/22", "****"),)
)
worker4 = Worker(
self.Rota, "worker4", "group1", 1, not_available_to_work=(("12/03/22", "****"),)
)
self.Rota.add_workers((worker3, worker4))
self.Rota.add_shifts(
SingleShift(
("group1",), "night_weekend", 12.5, days[5:], workers_required=3, constraints=["night"]
),
)
self.Rota.build_and_solve(options={"ratio": 0.00})
assert self.Rota.results.solver.status == "warning"
# 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(), "****"),)
# )
# worker4 = Worker(
# self.Rota, "worker4", "group1", 1, not_available_to_work=((datetime.datetime.strptime("12/03/22", "%d/%m/%y").date(), "****"),)
# )
# self.Rota.add_workers((worker3, worker4))
#
# self.Rota.add_shifts(
# SingleShift(
# ("group1",), "night_weekend", 12.5, days[5:], workers_required=3, constraints=["night"]
# ),
# )
#
# self.Rota.build_and_solve(options={"ratio": 0.00})
#
# assert self.Rota.results.solver.status == "warning"
if __name__ == "__main__":
t = TestLimitConstraints()
test/test_shifts.py
+77
View File
@@ -0,0 +1,77 @@
import datetime
import pytest
from rota.shifts import InvalidShift, NoWorkers, RotaBuilder, SingleShift, days
from rota.workers import Worker
import itertools
def generate_basic_rota(weeks_to_rota=10):
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(Rota, "worker1", "group1", 1),
Worker(Rota, "worker2", "group1", 1),
]
)
return Rota
def date_generator(from_date, days):
n = 0
while True:
yield from_date
n = n + 1
if n >= days:
break
from_date = from_date + datetime.timedelta(days=1)
class TestShifts:
def test_duplicate_shifts(self):
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
assert Rota.results.solver.status == "ok"
assert Rota.results.solver.termination_condition == "optimal"
Rota.add_shifts(
SingleShift(
("group1"),
"a",
12.5,
days,
),
)
with pytest.raises(InvalidShift):
Rota.build_and_solve(options={"ratio": 0.000})
test/test_weekend_padding.py
-2
View File
@@ -1,5 +1,3 @@
from copy import deepcopy
from black import main
import pytest
from rota.shifts import NoWorkers, RotaBuilder, SingleShift, days
test/test_worker_requests.py
+499
View File
@@ -0,0 +1,499 @@
import datetime
import pytest
from rota.shifts import InvalidShift, NoWorkers, RotaBuilder, SingleShift, days
from rota.workers import Worker
import itertools
def generate_basic_rota(weeks_to_rota=10):
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(Rota, "worker1", "group1", 1),
Worker(Rota, "worker2", "group1", 1),
]
)
return Rota
def date_generator(from_date, days):
n = 0
while True:
yield from_date
n = n + 1
if n >= days:
break
from_date = from_date + datetime.timedelta(days=1)
class TestWorkerRequests:
def test_preferences_not_to_work(self):
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 5))),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("preferences_not_to_work")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46, 47)
shift_string = Rota.get_worker_shift_list_string(worker)
if worker.name == "worker3":
assert shift_string.startswith("-----")
else:
assert shift_string.startswith("aaaaa")
def test_preferences_not_to_work2(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 55))),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("preferences_not_to_work2")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46, 47)
shift_string = Rota.get_worker_shift_list_string(worker)
if worker.name == "worker3":
assert shift_string.endswith("a" * 15)
def test_preferences_not_to_work_all_shifts(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
pref_not_to_work=(list(date_generator(datetime.date(2022, 3, 7), 70))),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("preferences_not_to_work_all_shifts")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46, 47)
# shift_string = Rota.get_worker_shift_list_string(worker)
# if worker.name == "worker3":
# assert shift_string.startswith("-----")
# else:
# assert shift_string.startswith("aaaaa")
def test_unavailable_to_work(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
not_available_to_work=(
[
(i, "NOT AROUND")
for i in list(date_generator(datetime.date(2022, 3, 7), 23))
]
),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("unavailable_to_work")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46, 47)
# shift_string = Rota.get_worker_shift_list_string(worker)
# if worker.name == "worker3":
# assert shift_string.startswith("-----")
# else:
# assert shift_string.startswith("aaaaa")
def test_unavailable_to_work2(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
not_available_to_work=(
[
(i, "NOT AROUND")
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
balance_offset=1,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("unavailable_to_work2")
assert Rota.results.solver.status == "warning"
assert Rota.results.solver.termination_condition == "infeasible"
def test_unavailable_to_work3(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.constraint_options["balance_bank_holidays"] = False
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
not_available_to_work=(
[
(i, "NOT AROUND")
for i in list(date_generator(datetime.date(2022, 3, 7), 23))
]
),
pref_not_to_work=[datetime.date(2022, 5, 15)],
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
balance_offset=1,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("unavailable_to_work3")
assert Rota.results.solver.status == "ok"
assert Rota.results.solver.termination_condition == "optimal"
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] in (46, 47)
shift_string = Rota.get_worker_shift_list_string(worker)
if worker.name == "worker3":
assert shift_string.startswith("-"*23)
assert shift_string.endswith("-")
def test_unavailable_to_work2(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.add_workers(
[Worker(
Rota,
"worker3",
"group1",
1,
not_available_to_work=(
[
(i, "NOT AROUND")
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
),
Worker(
Rota,
"worker4",
"group1",
1,
not_available_to_work=(
[
(i, "NOT AROUND")
for i in list(date_generator(datetime.date(2022, 3, 7), 25))
]
),
),]
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=3,
balance_offset=1,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("unavailable_to_work4")
assert Rota.results.solver.status == "warning"
assert Rota.results.solver.termination_condition == "infeasible"
def test_work_requests(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.constraint_options["balance_bank_holidays"] = False
Rota.add_workers(
[Worker(
Rota,
"worker3",
"group1",
1,
work_requests=(
[
(i, "a")
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
),
Worker(
Rota,
"worker4",
"group1",
1,
work_requests=(
[
(i, "a")
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
),]
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=2,
balance_offset=1,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
Rota.export_rota_to_html("work_requests")
shift_summary = Rota.get_shift_summary_dict()
for worker_name in shift_summary:
worker_shifts = shift_summary[worker_name]
worker = Rota.get_worker_by_name(worker_name)
assert worker_shifts["a"] == 35
shift_string = Rota.get_worker_shift_list_string(worker)
if worker.name in ("worker3", "worker4"):
assert shift_string.startswith("a"*35)
def test_work_requests_invalid(self):
"""_summary_"""
Rota = generate_basic_rota()
Rota.constraint_options["balance_bank_holidays"] = False
Rota.add_worker(
Worker(
Rota,
"worker3",
"group1",
1,
work_requests=(
[
(i, "b")
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
),
)
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"a",
12.5,
days,
workers_required=1,
balance_offset=1,
force_as_block=False,
),
)
with pytest.raises(InvalidShift):
Rota.build_and_solve(options={"ratio": 0.000})
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"c",
12.5,
days,
workers_required=1,
balance_offset=1,
force_as_block=False,
),
)
with pytest.raises(InvalidShift):
Rota.build_and_solve(options={"ratio": 0.000})
Rota.add_shifts(
SingleShift(
("group1", "group2"),
"b",
12.5,
days,
workers_required=1,
balance_offset=1,
force_as_block=False,
),
)
Rota.build_and_solve(options={"ratio": 0.000})
assert Rota.results.solver.status == "ok"
assert Rota.results.solver.termination_condition == "optimal"
Rota.add_worker(
Worker(
Rota,
"worker4",
"group1",
1,
work_requests=(
[
(i, "d")
for i in list(date_generator(datetime.date(2022, 3, 7), 35))
]
),
),
)
with pytest.raises(InvalidShift):
Rota.build_and_solve(options={"ratio": 0.000})