Commit 47e6e215 authored by Georgios Dagkakis's avatar Georgios Dagkakis Committed by Jérome Perrin

QueueManagedJob sortEntities added so that the Entities for which the manager is available go first

parent 16c0767d
...@@ -61,6 +61,7 @@ class QueueManagedJob(QueueJobShop): ...@@ -61,6 +61,7 @@ class QueueManagedJob(QueueJobShop):
if(len(activeObject.next)==1 or callerObject==None): if(len(activeObject.next)==1 or callerObject==None):
activeObject.receiver=activeObject.next[0] activeObject.receiver=activeObject.next[0]
return len(activeObjectQueue)>0\ return len(activeObjectQueue)>0\
and thecaller==activeObject.receiver and thecaller==activeObject.receiver
...@@ -77,5 +78,15 @@ class QueueManagedJob(QueueJobShop): ...@@ -77,5 +78,15 @@ class QueueManagedJob(QueueJobShop):
#return True if the Queue has Entities and the caller is the receiver #return True if the Queue has Entities and the caller is the receiver
return len(activeObjectQueue)>0 and (thecaller is self.receiver) return len(activeObjectQueue)>0 and (thecaller is self.receiver)
#override the default method so that Entities that have the manager available go in front
def sortEntities(self):
\ No newline at end of file QueueJobShop.sortEntities(self) #do the default sorting first
activeObjectQueue=self.getActiveObjectQueue()
for entity in activeObjectQueue:
entity.managerAvailable=False
if entity.manager:
if entity.manager.checkIfResourceIsAvailable:
entity.managerAvailable=True
activeObjectQueue.sort(key=lambda x: x.managerAvailable, reverse=True)
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment