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

MouldAssemblyBuffer comments

parent 38e4b128
...@@ -86,7 +86,7 @@ class MouldAssemblyBuffer(QueuePreemptive): ...@@ -86,7 +86,7 @@ class MouldAssemblyBuffer(QueuePreemptive):
# the mould is not ready for assembly # the mould is not ready for assembly
activeEntity.order.componentsReadyForAssembly = 0 activeEntity.order.componentsReadyForAssembly = 0
break break
# if the activeEntity is of type Order # if the activeEntity is of type Mould
except: except:
pass pass
return activeEntity return activeEntity
...@@ -131,12 +131,14 @@ class MouldAssemblyBuffer(QueuePreemptive): ...@@ -131,12 +131,14 @@ class MouldAssemblyBuffer(QueuePreemptive):
# if the successors (MouldAssembly) internal queue is empty then proceed with checking weather # if the successors (MouldAssembly) internal queue is empty then proceed with checking weather
# the caller is the receiver # the caller is the receiver
if len(receiverQueue)==0: if len(receiverQueue)==0:
if activeEntity.type=='Order': if activeEntity.type=='Mould':
return thecaller is activeObject.receiver return thecaller is activeObject.receiver
else: else:
return thecaller is activeObject.receiver\ return thecaller is activeObject.receiver\
and activeEntity.order.componentsReadyForAssembly and activeEntity.order.componentsReadyForAssembly
# otherwise, check additionally if the receiver holds orderComponents of the same order # otherwise, check additionally if the receiver holds orderComponents of the same order
# TODO: should revise, this check may be redundant, as the receiver (assembler must be empty in order to start receiving
# It is therefore needed that the control is performed by the assembler's getEntity()
else: else:
return thecaller is activeObject.receiver\ return thecaller is activeObject.receiver\
and receiverQueue[0].order is activeObjectQueue[0].order\ and receiverQueue[0].order is activeObjectQueue[0].order\
......
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