diff --git a/Car.py b/Car.py index c111b04..5be627d 100644 --- a/Car.py +++ b/Car.py @@ -164,8 +164,14 @@ class Car(): return cDist def getLeaderAtIntersection(self, prevInd, edgeInd): - if(self.route[edgeInd].isSpecial()): - return None + while(self.route[edgeInd].isSpecial()): + edgeInd = edgeInd + 1 + if edgeInd >= len(self.route): + return None + while self.route[prevInd].isSpecial(): + prevInd -= 1 + if prevInd < 0: + return None inter = self.route[edgeInd-1].getFromNode() connection = self.route[prevInd].getConnections(self.route[edgeInd])[0] linkInd = inter.getLinkIndex(connection)