Commit a1e73474 authored by Ioannis Papagiannopoulos's avatar Ioannis Papagiannopoulos Committed by Georgios Dagkakis

singalling in case of requiredParts sequence conclusion corrected

parent 63162428
...@@ -64,7 +64,7 @@ class ConditionalBuffer(QueueJobShop): ...@@ -64,7 +64,7 @@ class ConditionalBuffer(QueueJobShop):
# if the activeEntity is in the requierdParts of the entity # if the activeEntity is in the requierdParts of the entity
if activeEntity in requiredParts: if activeEntity in requiredParts:
# if the entity that requires the activeEntity can proceed then signal the currentStation of the entity # if the entity that requires the activeEntity can proceed then signal the currentStation of the entity
if entity.checkIfRequiredPartsReady(): if entity.checkIfRequiredPartsReady() and entity.currentStation.expectedSignals['canDispose']:
entity.mayProceed=True entity.mayProceed=True
self.sendSignal(receiver=entity.currentStation, signal=entity.currentStation.canDispose) self.sendSignal(receiver=entity.currentStation, signal=entity.currentStation.canDispose)
return activeEntity return activeEntity
......
...@@ -75,7 +75,7 @@ class ExitJobShop(Exit): ...@@ -75,7 +75,7 @@ class ExitJobShop(Exit):
# if the activeEntity is in the requierdParts of the entity # if the activeEntity is in the requierdParts of the entity
if activeEntity in requiredParts: if activeEntity in requiredParts:
# if the entity that requires the activeEntity can proceed then signal the currentStation of the entity # if the entity that requires the activeEntity can proceed then signal the currentStation of the entity
if entity.checkIfRequiredPartsReady(): if entity.checkIfRequiredPartsReady() and entity.currentStation.expectedSignals['canDispose']:
self.sendSignal(receiver=entity.currentStation, signal=entity.currentStation.canDispose) self.sendSignal(receiver=entity.currentStation, signal=entity.currentStation.canDispose)
return activeEntity return activeEntity
\ 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