correction to router

b2e6df63 · Ioannis Papagiannopoulos · Jérome Perrin · 218643f5 · b2e6df63
Commit b2e6df63 authored Sep 30, 2014 by Ioannis Papagiannopoulos Committed by Jérome Perrin Feb 04, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

dream/simulation/OperatorRouter.py dream/simulation/OperatorRouter.py +2 -1

No files found.
--- a/dream/simulation/OperatorRouter.py
+++ b/dream/simulation/OperatorRouter.py
@@ -383,7 +383,8 @@ class Router(ObjectInterruption):
                    for predecessor in station.previous:
                        if predecessor in self.pendingQueues and not station in occupiedStations and station.isInRouteOf(predecessor):
                            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+=[x for x in predecessor.getActiveObjectQueue()
 #                                                        if x in self.pending and not x in occupiedEntities]