Fix bugs with consistency optimisation

Author: meatballs

src/scheduler/cli.py

@@ -2,6 +2,8 @@
 from pathlib import Path
 
 import click
+from conference_scheduler.scheduler import event_schedule_difference
+from conference_scheduler.converter import solution_to_schedule
 from conference_scheduler.validator import (
     is_valid_solution, solution_violations)
 import daiquiri
@@ -65,10 +67,21 @@ def build(algorithm, objective, input_dir, solution_dir, build_dir):
 
     kwargs = {}
     if objective == 'consistency':
-        kwargs['original_solution'] = io.import_solution()
+        original_solution = io.import_solution()
+        defn.add_allocations(events, slots, original_solution, allocations)
+        original_schedule = solution_to_schedule(
+            original_solution, events, slots)
+        kwargs['original_schedule'] = original_schedule
 
     solution = calc.solution(events, slots, algorithm, objective, **kwargs)
 
+    if objective == 'consistency':
+        schedule = solution_to_schedule(solution, events, slots)
+        event_diff = event_schedule_difference(schedule, original_schedule)
+        logger.debug(f'\nevent_diff:')
+        for item in event_diff:
+            logger.debug(f'{item.event.name} has moved from {item.old_slot.venue} at {item.old_slot.starts_at} to {item.new_slot.venue} at {item.new_slot.starts_at}')
+
     if solution is not None:
         defn.add_allocations(events, slots, solution, allocations)
         logger.debug(convert.schedule_to_text(solution, events, slots))

src/scheduler/denormalise.py

@@ -278,7 +278,7 @@ def allocations(allocations_definition):
                 'event': Event(
                     name=event,
                     duration=0,
-                    demand=None,
+                    demand=0,
                     tags=details['tags']),
                 'slot': Slot(
                     venue=details['venue'],