Add entity sorting

Initially sort entities by number of restrictions (most to least) and then by compromises (most to least) each loop. Additionally adds the debug output so users can see the distribution easily.

calculateShifts.py

@@ -73,7 +73,13 @@ def toString(self):
 numEntities = len(arrEntities)
 shiftsPerEntity = ceil(numShifts / numEntities)
 daysPerShift = ceil(numDays / shiftsPerEntity)
-timeWindow = timedelta(daysPerShift + 2)
+timeWindow = timedelta(daysPerShift)
+
+# Initial entity sort - sort by day restrictions, most to least
+def sortByRestrictions(entity):
+    return len(entity.daysUnavailable)
+
+arrEntities.sort(reverse=True, key=sortByRestrictions)
 
 # Assign shifts
 entitiesRemaining = True
@@ -140,6 +146,16 @@ def balanceExistingDays(shift):
 
             # Assign the chosen shift!
             shiftCandidates[0].assign(entity)
+
+    # Sort entities by compromises
+    def sortByCompromises(entity):
+        return entity.numCompromises
+
+    arrEntities.sort(reverse=True, key=sortByCompromises)
+
+# Debug output
+for entity in arrEntities:
+    print(entity.toStringDebug())
 
 # Write the schedule
 with open('output.csv', 'w') as outputFile:

sampleEntities.csv

@@ -5,3 +5,4 @@ Steves,6-3,sun
 Schaefer,6-3,fri;sat
 Boncic,6-8,sat;sun
 Cooney,6-12,fri;sun
+Clarity,6-7,