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

correction to router

parent 6356fd9a
...@@ -383,7 +383,8 @@ class Router(ObjectInterruption): ...@@ -383,7 +383,8 @@ class Router(ObjectInterruption):
for predecessor in station.previous: for predecessor in station.previous:
if predecessor in self.pendingQueues and not station in occupiedStations and station.isInRouteOf(predecessor): if predecessor in self.pendingQueues and not station in occupiedStations and station.isInRouteOf(predecessor):
if predecessor.getActiveObjectQueue()[0] in self.pending\ if predecessor.getActiveObjectQueue()[0] in self.pending\
and not predecessor.getActiveObjectQueue()[0] in occupiedEntities: and not predecessor.getActiveObjectQueue()[0] in occupiedEntities\
and not predecessor.getActiveObjectQueue()[0] in operator.candidateEntities:
operator.candidateEntities.append(predecessor.getActiveObjectQueue()[0]) operator.candidateEntities.append(predecessor.getActiveObjectQueue()[0])
# operator.candidateEntities+=[x for x in predecessor.getActiveObjectQueue() # operator.candidateEntities+=[x for x in predecessor.getActiveObjectQueue()
# if x in self.pending and not x in occupiedEntities] # if x in self.pending and not x in occupiedEntities]
......
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