Commit 318f32a1 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Jérome Perrin

comments clean-up

parent 00950a27
...@@ -34,7 +34,7 @@ class M3(BatchScrapMachine): ...@@ -34,7 +34,7 @@ class M3(BatchScrapMachine):
# ======================================================================= # =======================================================================
# This is only for a BatchScrapMachine that is followed by a BatchDecomposition # This is only for a BatchScrapMachine that is followed by a BatchDecomposition
# We consider that since this is in essence one station, the BatchScrapMachine should be blocked if the # We consider that since this is in essence one station, the BatchScrapMachine
# should be blocked if the BatchDecomposition is blocked # should be blocked if the BatchDecomposition is blocked
# ======================================================================= # =======================================================================
def canAcceptAndIsRequested(self): def canAcceptAndIsRequested(self):
......
...@@ -219,6 +219,9 @@ class Machine(CoreObject): ...@@ -219,6 +219,9 @@ class Machine(CoreObject):
# may fall in failure mode (assignExit()?) # may fall in failure mode (assignExit()?)
self.currentEntity=self.getEntity() self.currentEntity=self.getEntity()
# TODO: the Machine receive the entity after the operator is available
# the canAcceptAndIsRequested method checks only in case of Load type of operation
# ======= request a resource if it is not already assigned an Operator # ======= request a resource if it is not already assigned an Operator
if(self.operatorPool!="None")\ if(self.operatorPool!="None")\
and any(type=="Processing" or type=="Setup" for type in self.multOperationTypeList)\ and any(type=="Processing" or type=="Setup" for type in self.multOperationTypeList)\
...@@ -465,7 +468,7 @@ class Machine(CoreObject): ...@@ -465,7 +468,7 @@ class Machine(CoreObject):
# operation is assigned # operation is assigned
return activeObject.Up and len(activeObjectQueue)<activeObject.capacity\ return activeObject.Up and len(activeObjectQueue)<activeObject.capacity\
and giverObject.haveToDispose(activeObject) and giverObject.haveToDispose(activeObject)
# if the set-up performance needs be first performed before the transfer of the entity to # TODO: if the set-up performance needs be first performed before the transfer of the entity to
# the machine then the presence of an operator to setup the machine before the getEntity() # the machine then the presence of an operator to setup the machine before the getEntity()
# is requested # is requested
# return (activeObject.operatorPool=='None'\ # return (activeObject.operatorPool=='None'\
......
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