Commit 4db11447 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin

release of load operator performed after getEntity. manual Operation defined in entities route fix

parent f22166ab
...@@ -637,11 +637,11 @@ class Machine(CoreObject): ...@@ -637,11 +637,11 @@ class Machine(CoreObject):
#=================================================================== #===================================================================
#=================================================================== #===================================================================
#=================================================================== # #===================================================================
# # release a resource if the only operation type is Load # # # release a resource if the only operation type is Load
#=================================================================== # #===================================================================
if self.shouldYield(operationTypes={"Load":1, "Processing":0,"Setup":0},methods={'isOperated':1}): # if self.shouldYield(operationTypes={"Load":1, "Processing":0,"Setup":0},methods={'isOperated':1}):
yield self.env.process(self.release()) # yield self.env.process(self.release())
#=================================================================== #===================================================================
#=================================================================== #===================================================================
...@@ -663,6 +663,13 @@ class Machine(CoreObject): ...@@ -663,6 +663,13 @@ class Machine(CoreObject):
# TODO: the Machine receive the entity after the operator is available # TODO: the Machine receive the entity after the operator is available
# the canAcceptAndIsRequested method checks only in case of Load type of operation # the canAcceptAndIsRequested method checks only in case of Load type of operation
#===================================================================
# # release a resource if the only operation type is Load
#===================================================================
if self.shouldYield(operationTypes={"Load":1, "Processing":0,"Setup":0},methods={'isOperated':1}):
yield self.env.process(self.release())
#=================================================================== #===================================================================
# # request a resource if it is not already assigned an Operator # # request a resource if it is not already assigned an Operator
#=================================================================== #===================================================================
......
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