comparison python/events.py @ 882:4749b71aa7fb

corrected bugs in storage.py when having configuration files and other files in different directories: everything should be relative to directory of command line when running the program (see FAQ)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 15 Mar 2017 12:36:03 -0400
parents 8ba82b371eea
children e2452abba0e7
comparison
equal deleted inserted replaced
881:8ba82b371eea 882:4749b71aa7fb
238 238
239 def computePET(self, collisionDistanceThreshold): 239 def computePET(self, collisionDistanceThreshold):
240 # TODO add crossing zone 240 # TODO add crossing zone
241 pet = moving.MovingObject.computePET(self.roadUser1, self.roadUser2, collisionDistanceThreshold) 241 pet = moving.MovingObject.computePET(self.roadUser1, self.roadUser2, collisionDistanceThreshold)
242 if pet is not None: # TODO get crossing zone and time 242 if pet is not None: # TODO get crossing zone and time
243 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[10], {0: pet}, mostSevereIsMax = False 243 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[10], {0: pet}, mostSevereIsMax = False))
244 244
245 def setCollision(self, collision): 245 def setCollision(self, collision):
246 '''indicates if it is a collision: argument should be boolean''' 246 '''indicates if it is a collision: argument should be boolean'''
247 self.collision = collision 247 self.collision = collision
248 248