# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1435701374 14400
# Node ID c4363aa6f0e54e6936788247e15999f26dd0631c
# Parent  5ee22bf7e4d55ee1580b9649ec1c16c35b2c62d1
updated function to find road users for interactions

diff -r 5ee22bf7e4d5 -r c4363aa6f0e5 python/events.py
--- a/python/events.py	Tue Jun 30 15:46:31 2015 -0400
+++ b/python/events.py	Tue Jun 30 17:56:14 2015 -0400
@@ -113,20 +113,23 @@
         return self.roadUserNumbers
 
     def setRoadUsers(self, objects):
-        nums = list(self.getRoadUserNumbers())
-        if objects[nums[0]].getNum() == nums[0]:
+        nums = sorted(list(self.getRoadUserNumbers()))
+        if nums[0]<len(objects) and objects[nums[0]].getNum() == nums[0]:
             self.roadUser1 = objects[nums[0]]
-        if objects[nums[1]].getNum() == nums[1]:
+        if nums[1]<len(objects) and objects[nums[1]].getNum() == nums[1]:
             self.roadUser2 = objects[nums[1]]
 
-        i = 0
-        while i < len(objects) and self.roadUser2 is None:
-            if objects[i].getNum() in nums:
-                if self.roadUser1 is None:
-                    self.roadUser1 = objects[i]
-                else:
-                    self.roadUser2 = objects[i]
-            i += 1
+        if self.roadUser1 is None or self.roadUser2 is None:
+            self.roadUser1 = None
+            self.roadUser2 = None
+            i = 0
+            while i < len(objects) and self.roadUser2 is None:
+                if objects[i].getNum() in nums:
+                    if self.roadUser1 is None:
+                        self.roadUser1 = objects[i]
+                    else:
+                        self.roadUser2 = objects[i]
+                i += 1
 
     def getIndicator(self, indicatorName):
         return self.indicators.get(indicatorName, None)