Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 358:c41ff9f3c263
moved current method for collision points and crossing zones computation into prediction parameters (put expectedindicator in SafetyPoint)
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Thu, 11 Jul 2013 00:17:25 -0400 |
parents | e5fe0e6d48a1 |
children | 3805b9639647 |
comparison
equal
deleted
inserted
replaced
357:e5fe0e6d48a1 | 358:c41ff9f3c263 |
---|---|
115 if timeInterval: | 115 if timeInterval: |
116 commonTimeInterval = timeInterval | 116 commonTimeInterval = timeInterval |
117 else: | 117 else: |
118 commonTimeInterval = self.timeInterval | 118 commonTimeInterval = self.timeInterval |
119 for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors | 119 for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors |
120 self.collisionPoints[i], self.crossingZones[i] = prediction.computeCrossingsCollisionsAtInstant(i, self.roadUser1, self.roadUser2, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ, debug) | 120 self.collisionPoints[i], self.crossingZones[i] = predictionParameters.computeCrossingsCollisionsAtInstant(i, self.roadUser1, self.roadUser2, collisionDistanceThreshold, timeHorizon, computeCZ, debug) |
121 if len(self.collisionPoints[i]) > 0: | 121 if len(self.collisionPoints[i]) > 0: |
122 TTCs[i] = prediction.computeExpectedIndicator(self.collisionPoints[i]) | 122 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(self.collisionPoints[i]) |
123 # add probability of collision, and probability of successful evasive action | 123 # add probability of collision, and probability of successful evasive action |
124 self.addIndicator(indicators.SeverityIndicator('TTC', TTCs)) | 124 self.addIndicator(indicators.SeverityIndicator('TTC', TTCs)) |
125 | 125 |
126 if computeCZ: | 126 if computeCZ: |
127 pPETs = {} | 127 pPETs = {} |
128 for i in list(commonTimeInterval)[:-1]: | 128 for i in list(commonTimeInterval)[:-1]: |
129 if len(self.crossingZones[i]) > 0: | 129 if len(self.crossingZones[i]) > 0: |
130 pPETs[i] = prediction.computeExpectedIndicator(self.crossingZones[i]) | 130 pPETs[i] = prediction.SafetyPoint.computeExpectedIndicator(self.crossingZones[i]) |
131 self.addIndicator(indicators.SeverityIndicator('pPET', pPETs)) | 131 self.addIndicator(indicators.SeverityIndicator('pPET', pPETs)) |
132 | 132 |
133 def addVideoFilename(self,videoFilename): | 133 def addVideoFilename(self,videoFilename): |
134 self.videoFilename= videoFilename | 134 self.videoFilename= videoFilename |
135 | 135 |