capacitystation objects updated

parent 7727b7b2
...@@ -62,10 +62,12 @@ class CapacityStationController(EventGenerator): ...@@ -62,10 +62,12 @@ class CapacityStationController(EventGenerator):
entitiesToCheck=list(station.getActiveObjectQueue()) entitiesToCheck=list(station.getActiveObjectQueue())
for entity in entitiesToCheck: for entity in entitiesToCheck:
if not exit.isRequested.triggered: # this is needed because the signal can be triggered also by the buffer if not exit.isRequested.triggered: # this is needed because the signal can be triggered also by the buffer
exit.isRequested.succeed(station) # send is requested to station succeedTuple=(station,self.env.now)
exit.isRequested.succeed(succeedTuple) # send is requested to station
# wait until the entity is removed # wait until the entity is removed
station.waitEntityRemoval=True station.waitEntityRemoval=True
yield station.entityRemoved yield station.entityRemoved
transmitter, eventTime=station.entityRemoved.value
station.waitEntityRemoval=False station.waitEntityRemoval=False
exit.currentlyObtainedEntities.append(entity) exit.currentlyObtainedEntities.append(entity)
station.entityRemoved=self.env.event() station.entityRemoved=self.env.event()
...@@ -113,10 +115,12 @@ class CapacityStationController(EventGenerator): ...@@ -113,10 +115,12 @@ class CapacityStationController(EventGenerator):
for entity in entitiesToCheck: for entity in entitiesToCheck:
if not entity.shouldMove: # when the first entity that should not move is reached break if not entity.shouldMove: # when the first entity that should not move is reached break
break break
station.isRequested.succeed(buffer) # send is requested to station succeedTuple=(buffer,self.env.now)
station.isRequested.succeed(succeedTuple) # send is requested to station
# wait until the entity is removed # wait until the entity is removed
buffer.waitEntityRemoval=True buffer.waitEntityRemoval=True
yield buffer.entityRemoved yield buffer.entityRemoved
transmitter, eventTime=buffer.entityRemoved.value
buffer.waitEntityRemoval=False buffer.waitEntityRemoval=False
buffer.entityRemoved=self.env.event() buffer.entityRemoved=self.env.event()
project=entity.capacityProject project=entity.capacityProject
......
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