redundant check for operator removed from MachineManagedJob

parent bd8f3e41
...@@ -151,13 +151,10 @@ class MachineManagedJob(MachineJobShop): ...@@ -151,13 +151,10 @@ class MachineManagedJob(MachineJobShop):
else: else:
# the operator doesn't have to be present for the loading of the machine as the load operation # the operator doesn't have to be present for the loading of the machine as the load operation
# is not assigned to operators # is not assigned to operators
if activeObject.Up and len(activeObjectQueue)<activeObject.capacity and isRequested\ if activeObject.Up and len(activeObjectQueue)<activeObject.capacity and isRequested:
and self.checkOperator(): # update entityToGet
# update entityToGet self.entityToGet=self.giver.getActiveObjectQueue()[0]
self.entityToGet=self.giver.getActiveObjectQueue()[0] return activeObject.Up and len(activeObjectQueue)<activeObject.capacity and isRequested
return activeObject.Up and len(activeObjectQueue)<activeObject.capacity and isRequested\
and self.checkOperator()
# return activeObject.Up and len(activeObjectQueue)<activeObject.capacity and isRequested
# while if the set up is performed before the (automatic) loading of the machine then the availability of the # while if the set up is performed before the (automatic) loading of the machine then the availability of the
# operator is requested # operator is requested
# return (activeObject.operatorPool=='None' or activeObject.operatorPool.checkIfResourceIsAvailable())\ # return (activeObject.operatorPool=='None' or activeObject.operatorPool.checkIfResourceIsAvailable())\
......
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