diff --git a/rota.csv b/rota.csv new file mode 100644 index 0000000..efeac5f --- /dev/null +++ b/rota.csv @@ -0,0 +1,95 @@ +"Name","Michal Tomek","Alex Wood","Wijhdan Abusrewil","Madalina Drumea","Paul Ward","Sayed Alqarooni","Delilah Trimmer","Rebecca Murphy","Tom Welsh","Tom Davies","Alexander Sanchez","Hannah Lewis","Seren Peters","Jean Sukumar","Amina Odeh","George Edwards","Jenn Fong","Sophie McGlade","Khalil Madbak","Richard Chaytor","S Ghauri","Huub Witt","Karis McFeely","Christian Greer","Max Ireland","Alan Eccles","Chong Ng","Charles Finan","Matthew Thorley","Mo Babsail","Paul Jenkins","Jon Skinner","Nicolas Dziad","Vilim Kalamar","Amoolya Mannava","Chi Leung","Sarath Vennam","Natasha Hougham","Ross Kruger","Jack Looker" +"Site","exeter","exeter","exeter","exeter","exeter","exeter","exeter","exeter","exeter","exeter","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","plymouth","torquay","torquay","torquay","torquay","torquay","torquay","torquay","torquay","torquay","truro","truro","truro","truro","truro","truro","truro","truro" +"Grade","2","2","2","3","3","3","4","4","4","5","2","2","2","3","3","3","3","4","4","4","4","5","5","2","2","3","3","3","3","3","4","5","2","2","3","3","3","4","4","5" +"FTE","80","100","100","100","100","100","60","100","100","100","100","100","100","60","100","100","100","80","100","100","100","100","100","100","100","80","80","100","100","100","100","100","100","100","100","100","100","100","100","100" +"Week 1 Day Mon","","","","","exeter_twilight","","","","","","","","","","","","plymouth_twilight","","","night_weekday","","","","night_weekday","torquay_twilight","","","","","","","","","","","night_weekday","","","","truro_twilight" +"Week 1 Day Tue","","","","exeter_twilight","","","","","","","","plymouth_twilight","","","","","","","","night_weekday","","","","night_weekday","torquay_twilight","","","","","","","","","truro_twilight","","night_weekday","","","","" +"Week 1 Day Wed","","","","","exeter_twilight","","","","","","","","","","","","","","","night_weekday","plymouth_twilight","","","night_weekday","torquay_twilight","","","","","","","","truro_twilight","","","night_weekday","","","","" +"Week 1 Day Thu","exeter_twilight","","","","","","","","","","","","","","","","plymouth_twilight","","","night_weekday","","","","night_weekday","torquay_twilight","","","","","","","","","","","night_weekday","","","truro_twilight","" +"Week 1 Day Fri","","","","","","weekend_exeter","","night_weekend","","","night_weekend","","","","plymouth_twilight","","","","","","","","","","","","night_weekend","","","","","weekend_torquay","","","","","weekend_truro","","","" +"Week 1 Day Sat","","","","","","weekend_exeter","","night_weekend","","","night_weekend","weekend_plymouth1","","","","weekend_plymouth2","","","","","","","","","","","night_weekend","","","","","weekend_torquay","","","","","weekend_truro","","","" +"Week 1 Day Sun","","","","","","weekend_exeter","","night_weekend","","","night_weekend","weekend_plymouth1","","","","weekend_plymouth2","","","","","","","","","","","night_weekend","","","","","weekend_torquay","","","","","weekend_truro","","","" +"Week 2 Day Mon","","","night_weekday","exeter_twilight","","","","","","","","","plymouth_twilight","","","","night_weekday","","","","","","","","","torquay_twilight","","","","","","","","","","","","truro_twilight","night_weekday","" +"Week 2 Day Tue","","","night_weekday","","","","","","exeter_twilight","","","","","","","plymouth_twilight","night_weekday","","","","","","","","","torquay_twilight","","","","","","","","truro_twilight","","","","","night_weekday","" +"Week 2 Day Wed","","","night_weekday","exeter_twilight","","","","","","","","","","","","","night_weekday","","","","plymouth_twilight","","","","","","","","","","","torquay_twilight","","","","","truro_twilight","","night_weekday","" +"Week 2 Day Thu","","","night_weekday","","","","","","exeter_twilight","","","","","","","","night_weekday","","plymouth_twilight","","","","","","","torquay_twilight","","","","","","","","truro_twilight","","","","","night_weekday","" +"Week 2 Day Fri","","weekend_exeter","","","night_weekend","","","","","","","","","","","plymouth_twilight","","","","","","night_weekend","","","night_weekend","","","","weekend_torquay","","","","","","","","","","","weekend_truro" +"Week 2 Day Sat","","weekend_exeter","","","night_weekend","","","","","","","","weekend_plymouth1","","weekend_plymouth2","","","","","","","night_weekend","","","night_weekend","","","","weekend_torquay","","","","","","","","","","","weekend_truro" +"Week 2 Day Sun","","weekend_exeter","","","night_weekend","","","","","","","","weekend_plymouth1","","weekend_plymouth2","","","","","","","night_weekend","","","night_weekend","","","","weekend_torquay","","","","","","","","","","","weekend_truro" +"Week 3 Day Mon","","","","","","","","exeter_twilight","night_weekday","","","night_weekday","","","","","","","","plymouth_twilight","","","","torquay_twilight","","","","night_weekday","","","","","","","","truro_twilight","","","","" +"Week 3 Day Tue","exeter_twilight","","","","","","","","night_weekday","","","night_weekday","plymouth_twilight","","","","","","","","","","","","","","torquay_twilight","night_weekday","","","","","","","","truro_twilight","","","","" +"Week 3 Day Wed","","exeter_twilight","","","","","","","night_weekday","","","night_weekday","","","","","","","","","plymouth_twilight","","","","","","torquay_twilight","night_weekday","","","","","","","","","","truro_twilight","","" +"Week 3 Day Thu","","","","","exeter_twilight","","","","night_weekday","","","night_weekday","","","plymouth_twilight","","","","","","","","","","","","torquay_twilight","night_weekday","","","","","","","","","","truro_twilight","","" +"Week 3 Day Fri","","","","","","","","weekend_exeter","","","","","","","plymouth_twilight","night_weekend","","","","","","","","weekend_torquay","","","","","","","","night_weekend","","weekend_truro","","","night_weekend","","","" +"Week 3 Day Sat","","","","","","","","weekend_exeter","","","","","","","","night_weekend","","","","","weekend_plymouth1","","weekend_plymouth2","weekend_torquay","","","","","","","","night_weekend","","weekend_truro","","","night_weekend","","","" +"Week 3 Day Sun","","","","","","","","weekend_exeter","","","","","","","","night_weekend","","","","","weekend_plymouth1","","weekend_plymouth2","weekend_torquay","","","","","","","","night_weekend","","weekend_truro","","","night_weekend","","","" +"Week 4 Day Mon","","","","","night_weekday","exeter_twilight","","","","","","","plymouth_twilight","","","","","","","","","night_weekday","","","night_weekday","","","","","torquay_twilight","","","truro_twilight","","","","","","","" +"Week 4 Day Tue","","","","","night_weekday","exeter_twilight","","","","","","","","","","","plymouth_twilight","","","","","night_weekday","","","night_weekday","","","","","torquay_twilight","","","truro_twilight","","","","","","","" +"Week 4 Day Wed","","","","","night_weekday","","","exeter_twilight","","","","","","","","","","","","","plymouth_twilight","night_weekday","","","night_weekday","","","","","torquay_twilight","","","","truro_twilight","","","","","","" +"Week 4 Day Thu","","","","","night_weekday","exeter_twilight","","","","","","","","","","","","","","","plymouth_twilight","night_weekday","","","night_weekday","","","","","torquay_twilight","","","","","","","","","","truro_twilight" +"Week 4 Day Fri","weekend_exeter","","night_weekend","","","","","","","","","","","","","","","","plymouth_twilight","night_weekend","","","","","","night_weekend","","weekend_torquay","","","","","weekend_truro","","","","","","","" +"Week 4 Day Sat","weekend_exeter","","night_weekend","","","","","","","","","","","","weekend_plymouth1","","","weekend_plymouth2","","night_weekend","","","","","","night_weekend","","weekend_torquay","","","","","weekend_truro","","","","","","","" +"Week 4 Day Sun","weekend_exeter","","night_weekend","","","","","","","","","","","","weekend_plymouth1","","","weekend_plymouth2","","night_weekend","","","","","","night_weekend","","weekend_torquay","","","","","weekend_truro","","","","","","","" +"Week 5 Day Mon","","","","","","","","","exeter_twilight","","","","","","","night_weekday","","","night_weekday","","","plymouth_twilight","","","torquay_twilight","","","","night_weekday","","","","","","","","","","truro_twilight","" +"Week 5 Day Tue","","","","exeter_twilight","","","","","","","","","plymouth_twilight","","","night_weekday","","","night_weekday","","","","","","torquay_twilight","","","","night_weekday","","","","","truro_twilight","","","","","","" +"Week 5 Day Wed","","","","","","exeter_twilight","","","","","","plymouth_twilight","","","","night_weekday","","","night_weekday","","","","","","torquay_twilight","","","","night_weekday","","","","","","","","","","","truro_twilight" +"Week 5 Day Thu","","","exeter_twilight","","","","","","","","plymouth_twilight","","","","","night_weekday","","","night_weekday","","","","","","torquay_twilight","","","","night_weekday","","","","","","","","","truro_twilight","","" +"Week 5 Day Fri","","","","night_weekend","","","","","weekend_exeter","","","","night_weekend","","","","","","","","","","plymouth_twilight","","","","","","","weekend_torquay","night_weekend","","","","","","","","","weekend_truro" +"Week 5 Day Sat","","","","night_weekend","","","","","weekend_exeter","","","weekend_plymouth2","night_weekend","","","","","","","","","weekend_plymouth1","","","","","","","","weekend_torquay","night_weekend","","","","","","","","","weekend_truro" +"Week 5 Day Sun","","","","night_weekend","","","","","weekend_exeter","","","weekend_plymouth2","night_weekend","","","","","","","","","weekend_plymouth1","","","","","","","","weekend_torquay","night_weekend","","","","","","","","","weekend_truro" +"Week 6 Day Mon","","exeter_twilight","","","","","","night_weekday","","","","","","","night_weekday","","","","plymouth_twilight","","","","","","","","","torquay_twilight","","","","","","","truro_twilight","","night_weekday","","","" +"Week 6 Day Tue","","","","","exeter_twilight","","","night_weekday","","","","plymouth_twilight","","","night_weekday","","","","","","","","","","","","","torquay_twilight","","","","","","","truro_twilight","","night_weekday","","","" +"Week 6 Day Wed","","","","","exeter_twilight","","","night_weekday","","","","","","","night_weekday","","plymouth_twilight","","","","","","","","","","","torquay_twilight","","","","","","","","truro_twilight","night_weekday","","","" +"Week 6 Day Thu","","","exeter_twilight","","","","","night_weekday","","","plymouth_twilight","","","","night_weekday","","","","","","","","","","","","","","","torquay_twilight","","","","","","","night_weekday","","","truro_twilight" +"Week 6 Day Fri","","night_weekend","","","","","weekend_exeter","","","","","","plymouth_twilight","","","","","night_weekend","","","","","","","","","weekend_torquay","","","","","","","","night_weekend","","","","weekend_truro","" +"Week 6 Day Sat","","night_weekend","","","","","weekend_exeter","","","","","","","weekend_plymouth2","","","weekend_plymouth1","night_weekend","","","","","","","","","weekend_torquay","","","","","","","","night_weekend","","","","weekend_truro","" +"Week 6 Day Sun","","night_weekend","","","","","weekend_exeter","","","","","","","weekend_plymouth2","","","weekend_plymouth1","night_weekend","","","","","","","","","weekend_torquay","","","","","","","","night_weekend","","","","weekend_truro","" +"Week 7 Day Mon","night_weekday","","","exeter_twilight","","","","","","","","","","","","","","","","plymouth_twilight","","","night_weekday","","","","","","torquay_twilight","night_weekday","","","","","","","","","","truro_twilight" +"Week 7 Day Tue","night_weekday","","","","","","","","exeter_twilight","","","","","","","","plymouth_twilight","","","","","","night_weekday","","","","","","torquay_twilight","night_weekday","","","","","","","","","","truro_twilight" +"Week 7 Day Wed","night_weekday","","","","","","","exeter_twilight","","","plymouth_twilight","","","","","","","","","","","","night_weekday","","","","","","torquay_twilight","night_weekday","","","","","","","truro_twilight","","","" +"Week 7 Day Thu","night_weekday","","","","","","","","exeter_twilight","","","","","","","plymouth_twilight","","","","","","","night_weekday","","","","","","torquay_twilight","night_weekday","","","","","","","","truro_twilight","","" +"Week 7 Day Fri","","","","weekend_exeter","","night_weekend","","","","","","","","","","","plymouth_twilight","","night_weekend","","","","","weekend_torquay","","","","","","","","","weekend_truro","","","","","","","night_weekend" +"Week 7 Day Sat","","","","weekend_exeter","","night_weekend","","","","","","","","","","weekend_plymouth2","","","night_weekend","","","weekend_plymouth1","","weekend_torquay","","","","","","","","","weekend_truro","","","","","","","night_weekend" +"Week 7 Day Sun","","","","weekend_exeter","","night_weekend","","","","","","","","","","weekend_plymouth2","","","night_weekend","","","weekend_plymouth1","","weekend_torquay","","","","","","","","","weekend_truro","","","","","","","night_weekend" +"Week 8 Day Mon","","","","","","","","","exeter_twilight","","night_weekday","","","","","","","","","plymouth_twilight","","","","","","","","","","","torquay_twilight","night_weekday","","","truro_twilight","","","night_weekday","","" +"Week 8 Day Tue","exeter_twilight","","","","","","","","","","night_weekday","plymouth_twilight","","","","","","","","","","","","","","","","","","","torquay_twilight","night_weekday","","","","truro_twilight","","night_weekday","","" +"Week 8 Day Wed","","exeter_twilight","","","","","","","","","night_weekday","","","","","plymouth_twilight","","","","","","","","","","","","","","","torquay_twilight","night_weekday","","","","truro_twilight","","night_weekday","","" +"Week 8 Day Thu","","","","","","","exeter_twilight","","","","night_weekday","","","","","plymouth_twilight","","","","","","","","","","","","","","","torquay_twilight","night_weekday","","","","truro_twilight","","night_weekday","","" +"Week 8 Day Fri","","","weekend_exeter","","","","","night_weekend","","","","","","","","","","","","plymouth_twilight","","","","","","","","night_weekend","","weekend_torquay","","","","night_weekend","weekend_truro","","","","","" +"Week 8 Day Sat","","","weekend_exeter","","","","","night_weekend","","","","","","","","","weekend_plymouth1","","","","","","weekend_plymouth2","","","","","night_weekend","","weekend_torquay","","","","night_weekend","weekend_truro","","","","","" +"Week 8 Day Sun","","","weekend_exeter","","","","","night_weekend","","","","","","","","","weekend_plymouth1","","","","","","weekend_plymouth2","","","","","night_weekend","","weekend_torquay","","","","night_weekend","weekend_truro","","","","","" +"Week 9 Day Mon","","","","","exeter_twilight","night_weekday","","","","","plymouth_twilight","","","","","","","night_weekday","","","","","","","","","night_weekday","","","","","torquay_twilight","","","","","truro_twilight","","","" +"Week 9 Day Tue","","exeter_twilight","","","","night_weekday","","","","","","","","","","","","night_weekday","plymouth_twilight","","","","","","","","night_weekday","","","","","torquay_twilight","","","","truro_twilight","","","","" +"Week 9 Day Wed","","","","","","night_weekday","","exeter_twilight","","","","","","","","","","night_weekday","","plymouth_twilight","","","","","","","night_weekday","","","","","torquay_twilight","","","","truro_twilight","","","","" +"Week 9 Day Thu","","","","","","night_weekday","exeter_twilight","","","","","","","","plymouth_twilight","","","night_weekday","","","","","","","","","night_weekday","","","","","torquay_twilight","","","","","","truro_twilight","","" +"Week 9 Day Fri","","weekend_exeter","","","","","","","","","","","","","","plymouth_twilight","","","","","night_weekend","","","","","night_weekend","","","","","weekend_torquay","","night_weekend","","","weekend_truro","","","","" +"Week 9 Day Sat","","weekend_exeter","","","","","","","","","weekend_plymouth1","","","","","","","","weekend_plymouth2","","night_weekend","","","","","night_weekend","","","","","weekend_torquay","","night_weekend","","","weekend_truro","","","","" +"Week 9 Day Sun","","weekend_exeter","","","","","","","","","weekend_plymouth1","","","","","","","","weekend_plymouth2","","night_weekend","","","","","night_weekend","","","","","weekend_torquay","","night_weekend","","","weekend_truro","","","","" +"Week 10 Day Mon","","","","","","","night_weekday","","","exeter_twilight","","","night_weekday","","","","","","","plymouth_twilight","","","","","","","","","torquay_twilight","","","","","","night_weekday","","","truro_twilight","","" +"Week 10 Day Tue","","","","exeter_twilight","","","night_weekday","","","","","","night_weekday","","","","","plymouth_twilight","","","","","","","","","","","torquay_twilight","","","","","","night_weekday","","","","truro_twilight","" +"Week 10 Day Wed","","","","exeter_twilight","","","night_weekday","","","","","","night_weekday","","","","","","","","","","plymouth_twilight","","","torquay_twilight","","","","","","","truro_twilight","","night_weekday","","","","","" +"Week 10 Day Thu","","","exeter_twilight","","","","night_weekday","","","","","","night_weekday","","","","","","","","","","plymouth_twilight","","","","","","torquay_twilight","","","","","","night_weekday","","truro_twilight","","","" +"Week 10 Day Fri","","","","","","weekend_exeter","","","","","","","","","","","night_weekend","","","","","plymouth_twilight","","night_weekend","","","","","","","","weekend_torquay","","","","","","night_weekend","weekend_truro","" +"Week 10 Day Sat","","","","","","weekend_exeter","","","","","","","","weekend_plymouth2","","","night_weekend","","","weekend_plymouth1","","","","night_weekend","","","","","","","","weekend_torquay","","","","","","night_weekend","weekend_truro","" +"Week 10 Day Sun","","","","","","weekend_exeter","","","","","","","","weekend_plymouth2","","","night_weekend","","","weekend_plymouth1","","","","night_weekend","","","","","","","","weekend_torquay","","","","","","night_weekend","weekend_truro","" +"Week 11 Day Mon","exeter_twilight","","","night_weekday","","","","","","","","plymouth_twilight","","","","","","","","","","","","","","","","","torquay_twilight","","night_weekday","","","night_weekday","","","truro_twilight","","","" +"Week 11 Day Tue","","","","night_weekday","exeter_twilight","","","","","","","","","","","","","plymouth_twilight","","","","","","","","","","torquay_twilight","","","night_weekday","","","night_weekday","","","truro_twilight","","","" +"Week 11 Day Wed","","","","night_weekday","","exeter_twilight","","","","","","","","","","","","","plymouth_twilight","","","","","","","","","torquay_twilight","","","night_weekday","","","night_weekday","","","","truro_twilight","","" +"Week 11 Day Thu","","","","night_weekday","","","exeter_twilight","","","","","","","","","","","","plymouth_twilight","","","","","","","","torquay_twilight","","","","night_weekday","","","night_weekday","","","","","truro_twilight","" +"Week 11 Day Fri","night_weekend","","","","weekend_exeter","","","","","","","","plymouth_twilight","","","","","","","","","","night_weekend","","","","","weekend_torquay","night_weekend","","","","","","","","weekend_truro","","","" +"Week 11 Day Sat","night_weekend","","","","weekend_exeter","","","","","","weekend_plymouth1","","","","","","","","weekend_plymouth2","","","","night_weekend","","","","","weekend_torquay","night_weekend","","","","","","","","weekend_truro","","","" +"Week 11 Day Sun","night_weekend","","","","weekend_exeter","","","","","","weekend_plymouth1","","","","","","","","weekend_plymouth2","","","","night_weekend","","","","","weekend_torquay","night_weekend","","","","","","","","weekend_truro","","","" +"Week 12 Day Mon","","","","","","","","exeter_twilight","","night_weekday","","","","","plymouth_twilight","","","","","","night_weekday","","","","","torquay_twilight","","","","","","","night_weekday","","truro_twilight","","","","","" +"Week 12 Day Tue","","","","","","","","","exeter_twilight","night_weekday","","","","","","","","plymouth_twilight","","","night_weekday","","","","","torquay_twilight","","","","","","","night_weekday","","truro_twilight","","","","","" +"Week 12 Day Wed","","","exeter_twilight","","","","","","","night_weekday","plymouth_twilight","","","","","","","","","","night_weekday","","","","","torquay_twilight","","","","","","","night_weekday","","","","","","truro_twilight","" +"Week 12 Day Thu","","exeter_twilight","","","","","","","","night_weekday","plymouth_twilight","","","","","","","","","","night_weekday","","","","","torquay_twilight","","","","","","","night_weekday","truro_twilight","","","","","","" +"Week 12 Day Fri","","","weekend_exeter","","","","","","night_weekend","","","","","","night_weekend","","","","","","","","plymouth_twilight","","","","","","","","weekend_torquay","","","","weekend_truro","night_weekend","","","","" +"Week 12 Day Sat","","","weekend_exeter","","","","","","night_weekend","","","","","","night_weekend","","","weekend_plymouth2","","weekend_plymouth1","","","","","","","","","","","weekend_torquay","","","","weekend_truro","night_weekend","","","","" +"Week 12 Day Sun","","","weekend_exeter","","","","","","night_weekend","","","","","","night_weekend","","","weekend_plymouth2","","weekend_plymouth1","","","","","","","","","","","weekend_torquay","","","","weekend_truro","night_weekend","","","","" +"Week 13 Day Mon","","night_weekday","","","","","","","","exeter_twilight","","","","night_weekday","","","","","","","","","plymouth_twilight","torquay_twilight","","","","","","","","","","truro_twilight","","","","","","night_weekday" +"Week 13 Day Tue","exeter_twilight","night_weekday","","","","","","","","","","plymouth_twilight","","night_weekday","","","","","","","","","","torquay_twilight","","","","","","","","","truro_twilight","","","","","","","night_weekday" +"Week 13 Day Wed","","night_weekday","exeter_twilight","","","","","","","","","","","night_weekday","","","","","","","plymouth_twilight","","","torquay_twilight","","","","","","","","","","","truro_twilight","","","","","night_weekday" +"Week 13 Day Thu","","night_weekday","","","","","exeter_twilight","","","","","","","night_weekday","plymouth_twilight","","","","","","","","","torquay_twilight","","","","","","","","","","truro_twilight","","","","","","night_weekday" +"Week 13 Day Fri","","","","","","","","","","weekend_exeter","","night_weekend","","","","","","","","","","","plymouth_twilight","","weekend_torquay","","","","","night_weekend","","","","","","","","weekend_truro","night_weekend","" +"Week 13 Day Sat","","","","","","","","","","weekend_exeter","","night_weekend","weekend_plymouth1","","","","","","","","weekend_plymouth2","","","","weekend_torquay","","","","","night_weekend","","","","","","","","weekend_truro","night_weekend","" +"Week 13 Day Sun","","","","","","","","","","weekend_exeter","","night_weekend","weekend_plymouth1","","","","","","","","weekend_plymouth2","","","","weekend_torquay","","","","","night_weekend","","","","","","","","weekend_truro","night_weekend","" diff --git a/shifts.py b/shifts.py index 6bdb1cd..e84e93b 100644 --- a/shifts.py +++ b/shifts.py @@ -98,7 +98,7 @@ class RotaBuilder(object): print("Start time: {}".format(datetime.datetime.now())) print("Weeks to rota: {}".format(weeks_to_rota)) - print("Use previous shifts".format(use_previous_shifts)) + print("Use previous shifts {}".format(use_previous_shifts)) self.shifts = [] # type List[SingleShift] diff --git a/test.py b/test.py index 4cf7360..8aa2131 100644 --- a/test.py +++ b/test.py @@ -1,5 +1,7 @@ from pyomo.environ import * from pyomo.opt import SolverFactory +from pyomo.opt.results import SolverStatus + from shifts import SingleShift, RotaBuilder, RotaResults, days from workers import Worker @@ -17,10 +19,10 @@ import operator use_neos = False -weeks_to_rota = 13 +weeks_to_rota = 26 time_to_run = 152000 -allow = 2000 +allow = 8000 sites = ("truro", "exeter", "torquay", "barnstaple", "plymouth") @@ -315,6 +317,11 @@ results.solver.status if not results.solver.status: sys.exit(0) +# optimizer = SolverFactory('cbc') +# result = optimizer.solve(prob,tee=True) +# result.Solver.Status = SolverStatus.warning +# prob.solutions.load_from(result) + ResultsHolder = RotaResults(Rota, results) week_table = ResultsHolder.get_work_table() # list with the required workers diff --git a/trainees.csv b/trainees.csv index 4f7f501..982948a 100644 --- a/trainees.csv +++ b/trainees.csv @@ -27,7 +27,7 @@ Seren Peters,Plymouth,ST2,100,,,,,,,, Sophie McGlade,Plymouth,ST4,80,Fri,,,,,,, Alan Eccles,Torquay,ST3,80,Fri,,,10 (8.49),6 (6.37),4 (6.12),6 (4.59), Charles Finan,Torquay,ST3,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), -Chong Ng,Torquay,ST3,80,Mon,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74), +Chong Ng,Torquay,ST3,100,,,,12 (10.61),6 (7.96),8 (7.65),6 (5.74), Christian Greer,Torquay,ST2,100,,,,9 (10.61),9 (7.96),8 (7.65),6 (5.74), Harriet Conley,Torquay,ST5,0,,,,,,,, Jon Skinner,Torquay,ST5,100,,,,12 (10.61),6 (7.96),4 (7.65),9 (5.74), @@ -45,4 +45,4 @@ Nicolas Dziad,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), Pete Abernethy,Truro,ST5,0,,,,10 (7.74),3 (5.81),0 (5.05),9 (3.79), Ross Kruger,Truro,ST4,100,,,,12 (11.74),9 (8.80),4 (7.65),9 (5.74), Sarath Vennam,Truro,ST3,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), -Vilim Kalamar,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), +Vilim Kalamar,Truro,ST2,100,,,,11 (11.74),9 (8.80),8 (7.65),6 (5.74), \ No newline at end of file diff --git a/workers.py b/workers.py index 528f342..39c1d63 100644 --- a/workers.py +++ b/workers.py @@ -48,15 +48,14 @@ class Worker: if self.end_date > Rota.rota_end_date: self.end_date = Rota.rota_end_date else: - days_to_work = (self.end_date - Rota.start_date).days + if self.end_date > Rota.start_date: + days_to_work = (self.end_date - Rota.start_date).days - if days_to_work < 0: - days_to_work = 0 - # add unavalabilities - for weeks_days in Rota.weeks_days_product[days_to_work:]: - week, day = weeks_days - Rota.unavailable_to_work.add((self.id, week, day)) + # add unavalabilities + for weeks_days in Rota.weeks_days_product[days_to_work:]: + week, day = weeks_days + Rota.unavailable_to_work.add((self.id, week, day)) if oop is not None: start_oop, end_oop = oop @@ -67,7 +66,7 @@ class Worker: # ignore oops if they finish before the rota start date - if end_oop_date < Rota.start_date: + if end_oop_date > Rota.start_date: if end_oop_date > Rota.rota_end_date: end_oop_date = Rota.rota_end_date