Mercurial Hosting > traffic-intelligence

diff python/events.py @ 357:e5fe0e6d48a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug computing TTC (resp. pPET) if there is no collision point (resp. crossing zone)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 11 Jul 2013 00:07:47 -0400
parents 2f39c4ed0b62
children c41ff9f3c263
line wrap: on
line diff
--- a/python/events.py	Wed Jul 10 18:22:45 2013 -0400
+++ b/python/events.py	Thu Jul 11 00:07:47 2013 -0400
@@ -118,15 +118,17 @@
             commonTimeInterval = self.timeInterval
         for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors
             self.collisionPoints[i], self.crossingZones[i] = prediction.computeCrossingsCollisionsAtInstant(i, self.roadUser1, self.roadUser2, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ, debug)
-            TTCs[i] = prediction.computeExpectedIndicator(self.collisionPoints[i])
+            if len(self.collisionPoints[i]) > 0:
+                TTCs[i] = prediction.computeExpectedIndicator(self.collisionPoints[i])
         # add probability of collision, and probability of successful evasive action
         self.addIndicator(indicators.SeverityIndicator('TTC', TTCs))
         
         if computeCZ:
             pPETs = {}
             for i in list(commonTimeInterval)[:-1]:
-                pPETs[i] = prediction.computeExpectedIndicator(self.crossingZones[i])
-                self.addIndicator(indicators.SeverityIndicator('pPET', pPETs))
+                if len(self.crossingZones[i]) > 0:
+                    pPETs[i] = prediction.computeExpectedIndicator(self.crossingZones[i])
+            self.addIndicator(indicators.SeverityIndicator('pPET', pPETs))
 
     def addVideoFilename(self,videoFilename):
         self.videoFilename= videoFilename