Update SchedBuilderClasses2.py

SchedBuilderClasses2.py

@@ -409,8 +409,21 @@ class Schedule():
             self.assnLog.append('NO STAFF! No one to force to '+sl.key())
             return None,'N' #No one to force
 
+    def checkForceStop(self,tup,iter,assn):
+        if tup!=None:
+            if iter==tup[0] and assn==tup[1]: return True
+            else: return False
+        else: return None
+
+    def handleAssnLog(self,WIPschd):
+        self.assnLog.extend(WIPschd.assnLog) #Add whats been logged this final iteration to master log
+        self.assnLog.extend(['final iteration: '+str(iter)])
+        WIPschd.assnLog=self.assnLog #Replace WIP with the master now that master had WIP tacked on to WWF assn since WIP sched object being passed as final outcome
+        return WIPschd
+        
+    
     @debug
-    def fillOutSched_v3(self,noVol=None,iter=0,pre8={},last=None):
+    def fillOutSched_v3(self,noVol=None,iter=0,pre8={},last=None,stop=None):
         """Improvement on v2 to prioritize voluntary 8 hour over voluntary 4hr, plus WWF crew assigning on long weekends"""
         if iter>self.maxI: return last
         #Setup
@@ -448,9 +461,15 @@ class Schedule():
                     if WIPschd.slots[k].assnType not in ['V','F']: #If k1 was already reached on prev iteration through k loop then don't perform assn function again
                         WIPschd.trackAssn(self.assns,loc='pre8 Success 1')
                         r=WIPschd.slots[k].assn(WIPschd,assnType="V",slAssignee=eId) 
+                        if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                            WIPschd=self.handleAssnLog(WIPschd)
+                            return WIPschd
                     if WIPschd.slots[k2].assnType not in ['V','F']: #See above
                         WIPschd.trackAssn(self.assns,loc='pre8 Success 2')
                         r=WIPschd.slots[k2].assn(WIPschd,assnType="V",slAssignee=eId) #Assign both. When the second one gets iterated to, slOK will return False for being assigned on same slot arleady and itll be harmless
+                        if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                            WIPschd=self.handleAssnLog(WIPschd)
+                            return WIPschd
                 #If this ee was forced earlier and so they are no longer ok for the full8 assign, then the pre8 is effectively skipped and re evaluated in the '8hr assn' phase
             else: #Case of assigning a slot not from pre8 list
                 s=WIPschd.slots[k]
@@ -458,6 +477,9 @@ class Schedule():
                 eId,tp=WIPschd.pickAssignee(s,tp='F')
                 WIPschd.trackAssn(self.assns,loc='force phase')
                 r=WIPschd.slots[k].assn(WIPschd,assnType=tp,slAssignee=eId) #return value to variable r is false if making that force assignments breaks rules around forcing past 48 hrs in week
+                if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                    WIPschd=self.handleAssnLog(WIPschd)
+                    return WIPschd
                 if r==False and s.key() not in WIPschd.noVol: #also check if this slot is already in noVol list. Coming to this statement after the fact, I realize there isn't any sensical logic path happening here if the persons forcing broke a rule, but the slot is not in the list. I realize this is because I wrote this if statement at a point where I thought forcings might happen mid-iteration, but after making it so that forcings only happen start of iteration, I think this if statement will never be met. That's because at this point in the algorithm, no voluntary weekend OT has been assigned. but the point of the 'return value' was checking if already-assigned voluntary OT happends before or after the OT that is being forced. But since no voluntary OT has been assigned at all, the return constraint will always be ok. The pickAssignee() method will always return the guy who si to be assigned because if the perosn simply worked enough OT in the week that they can't be forced, then the pickAssignee wouldn't havepicked them anyways
                     WIPschd.noVol.append(s.key())
                     WIPschd.assnLog.append('The last assignment created a broken schedule where the person' +WIPschd.ee[eId].lastNm+' had a forcing (previously assigned) after 48h in the week (just assigned.) Adding this slot to priority sequence and reiterating')
@@ -513,6 +535,9 @@ class Schedule():
                                     r1=WIPschd.slots[k1].assn(WIPschd,assnType="V",slAssignee=eId)
                                     WIPschd.trackAssn(self.assns,loc='asn 8 on shift 2')
                                     r2=WIPschd.slots[k2].assn(WIPschd,assnType="V",slAssignee=eId) #Don't need to check r1 or r2, they are redudnant with passing through frcOKdblAssn to get here
+                                    if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                                        WIPschd=self.handleAssnLog(WIPschd)
+                                        return WIPschd
                                     s=1
                                     #------ Check if their assignments being made requires that another slot be forced due to losing eligVol
                                     newK=set([k for k in WIPschd.slots if len(WIPschd.slots[k].eligVol)==0 and WIPschd.slots[k].assnType not in ['WWF','F','V','nV','DNS','N']]) #After assignment, see if anything now needing forcing that hasn't been seen before
@@ -551,8 +576,14 @@ class Schedule():
                                 if WIPschd.ee[eId].frcOKdblAssn(WIPschd,WIPschd.slots[k1]): #If function returns true.. no forcing rules were broken
                                     WIPschd.trackAssn(self.assns,loc='asn 8 straddle 1')
                                     r1=WIPschd.slots[k1].assn(WIPschd,assnType="V",slAssignee=eId)
+                                    if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                                        WIPschd=self.handleAssnLog(WIPschd)
+                                        return WIPschd
                                     WIPschd.trackAssn(self.assns,loc='asn 8 straddle 2')
                                     r2=WIPschd.slots[k2].assn(WIPschd,assnType="V",slAssignee=eId) #Don't need to check r1 or r2, they are redudnant with passing through frcOKdblAssn to get here
+                                    if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                                        WIPschd=self.handleAssnLog(WIPschd)
+                                        return WIPschd
                                     s=1
                                     #------ Check if their assignments being made requires that another slot be forced due to losing eligVol
                                     newK=set([k for k in WIPschd.slots if len(WIPschd.slots[k].eligVol)==0 and WIPschd.slots[k].assnType not in ['WWF','F','V','nV','DNS','N']]) #After assignment, see if anything now needing forcing that hasn't been seen before
@@ -618,6 +649,9 @@ class Schedule():
                     eId,tp=WIPschd.pickAssignee(curS)
                     WIPschd.trackAssn(self.assns,loc='4 hr assn')
                     r=WIPschd.slots[curS.key()].assn(WIPschd,assnType=tp,slAssignee=eId) #Note the assign method acts on original, not deepcopy, retrieved via key
+                    if self.checkForceStop(stop,iter,WIPschd.assignments)==True: 
+                            WIPschd=self.handleAssnLog(WIPschd)
+                            return WIPschd
                     newK=set([k for k in WIPschd.slots if len(WIPschd.slots[k].eligVol)==0 and WIPschd.slots[k].assnType not in ['WWF','F','V','nV','DNS','N']]) #After assignment, see if anything now needing forcing that hasn't been seen before
                     if len(newK-set(WIPschd.noVol))>0: #Case that a forced assignment made someone ineligible for a slot they were marked as the last volunteer in, creating a slot requiring forcing that hasn't been seen before, requiring re iteration
                         pullK=newK-set(WIPschd.noVol) #Get the keys for slots that are now without volunteers(could be more than one so use set subtraction)