Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 694:c4363aa6f0e5 dev
updated function to find road users for interactions
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 30 Jun 2015 17:56:14 -0400 |
parents | 9a258687af4c |
children | 957126bfb456 |
comparison
equal
deleted
inserted
replaced
693:5ee22bf7e4d5 | 694:c4363aa6f0e5 |
---|---|
111 | 111 |
112 def getRoadUserNumbers(self): | 112 def getRoadUserNumbers(self): |
113 return self.roadUserNumbers | 113 return self.roadUserNumbers |
114 | 114 |
115 def setRoadUsers(self, objects): | 115 def setRoadUsers(self, objects): |
116 nums = list(self.getRoadUserNumbers()) | 116 nums = sorted(list(self.getRoadUserNumbers())) |
117 if objects[nums[0]].getNum() == nums[0]: | 117 if nums[0]<len(objects) and objects[nums[0]].getNum() == nums[0]: |
118 self.roadUser1 = objects[nums[0]] | 118 self.roadUser1 = objects[nums[0]] |
119 if objects[nums[1]].getNum() == nums[1]: | 119 if nums[1]<len(objects) and objects[nums[1]].getNum() == nums[1]: |
120 self.roadUser2 = objects[nums[1]] | 120 self.roadUser2 = objects[nums[1]] |
121 | 121 |
122 i = 0 | 122 if self.roadUser1 is None or self.roadUser2 is None: |
123 while i < len(objects) and self.roadUser2 is None: | 123 self.roadUser1 = None |
124 if objects[i].getNum() in nums: | 124 self.roadUser2 = None |
125 if self.roadUser1 is None: | 125 i = 0 |
126 self.roadUser1 = objects[i] | 126 while i < len(objects) and self.roadUser2 is None: |
127 else: | 127 if objects[i].getNum() in nums: |
128 self.roadUser2 = objects[i] | 128 if self.roadUser1 is None: |
129 i += 1 | 129 self.roadUser1 = objects[i] |
130 else: | |
131 self.roadUser2 = objects[i] | |
132 i += 1 | |
130 | 133 |
131 def getIndicator(self, indicatorName): | 134 def getIndicator(self, indicatorName): |
132 return self.indicators.get(indicatorName, None) | 135 return self.indicators.get(indicatorName, None) |
133 | 136 |
134 def addIndicator(self, indicator): | 137 def addIndicator(self, indicator): |