Add unbounded events

Author: meatballs

src/scheduler/cli.py

@@ -101,10 +101,12 @@ def build(
 
     if solution is not None:
         allocations = defn.allocations(resources)
-        defn.add_allocations(events, slots, solution, allocations)
+        unbounded = defn.unbounded(resources)
+        defn.add_allocations(events, slots, solution, allocations, unbounded)
         logger.debug(convert.schedule_to_text(solution, events, slots))
         io.export_solution_and_definition(
-            resources, events, slots, solution, session.folders['solution'])
+            resources, events, slots, allocations, solution,
+            session.folders['solution'])
 
 
 @scheduler.command()

src/scheduler/define.py

@@ -98,6 +98,13 @@ def allocations(resources):
     return allocations
 
 
+def unbounded(resources):
+    unbounded = dn.unbounded(resources['unbounded'], resources['timetable'])
+    logger.debug(f'\nunbounded\n{unbounded}')
+    logger.info(f'{len(unbounded)} unbounded event(s)')
+    return unbounded
+
+
 def add_unavailability_to_events(events, slots, unavailability):
     for event, unavailable_slots in unavailability.items():
         events[event].add_unavailability(
@@ -124,7 +131,11 @@ def add_unsuitability_to_events(events, slots, unsuitability):
         'venue suitability.')
 
 
-def add_allocations(events, slots, solution, allocations):
+def add_allocations(events, slots, solution, allocations, unbounded):
+    for unbound in unbounded:
+        slots.append(unbound['slot'])
+
+    allocations.extend(unbounded)
     for allocation in allocations:
         events.append(allocation['event'])
 
@@ -134,3 +145,4 @@ def add_allocations(events, slots, solution, allocations):
         solution.append((event_idx, slot_idx))
 
     logger.info(f'Added {len(allocations)} pre-allocated event(s) to solution')
+    logger.info(f'Added {len(unbounded)} event(s) to solution')

src/scheduler/denormalise.py

@@ -294,3 +294,28 @@ def allocations(allocations_definition):
             for event, details in allocation.items()]
     except TypeError:
         return []
+
+
+def unbounded(unbound_definition, timetable):
+    return [
+        {
+            'event': Event(
+                name=event,
+                duration=0,
+                demand=0,
+                tags=[day, venue]),
+            'slot': Slot(
+                venue=venue,
+                starts_at=(datetime.combine(
+                    day,
+                    datetime.min.time()) +
+                    timedelta(seconds=details['starts_at'])),
+                duration=0,
+                session=f'{day} unbound',
+                capacity=0)
+        }
+        for unbound in unbound_definition
+        for event, details in unbound.items()
+        for venue, days in timetable.items()
+        for day in days
+    ]

src/scheduler/io.py

@@ -73,7 +73,7 @@ def import_schedule_definition(solution_folder):
 
 
 def pickle_solution_and_definition(
-    resources, events, slots, solution, solution_folder
+    resources, events, slots, allocations, solution, solution_folder
 ):
     """Store the computed solution, the resources dict and the associated
     events and slots lists in pickle format"""
@@ -84,6 +84,7 @@ def pickle_solution_and_definition(
         'resources': resources,
         'events': events,
         'slots': slots,
+        'allocations': allocations,
         'solution': solution
     }
     with pickle_file.open('wb') as f:
@@ -114,9 +115,9 @@ def export_schedule(solution, events, slots, solution_folder):
 
 
 def export_solution_and_definition(
-    resources, events, slots, solution, solution_folder
+    resources, events, slots, allocations, solution, solution_folder
 ):
     solution_folder.mkdir(exist_ok=True)
     pickle_solution_and_definition(
-        resources, events, slots, solution, solution_folder)
+        resources, events, slots, allocations, solution, solution_folder)
     export_schedule(solution, events, slots, solution_folder)