Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 630:69a98f84f3eb
corrected major issue with pPET, only for CVDirect prediction for now
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 17 Feb 2015 02:21:31 +0100 |
parents | 0a5e89d6fc62 |
children | 2d1d33ae1c69 |
comparison
equal
deleted
inserted
replaced
629:0a5e89d6fc62 | 630:69a98f84f3eb |
---|---|
194 | 194 |
195 if timeInterval != None: | 195 if timeInterval != None: |
196 commonTimeInterval = timeInterval | 196 commonTimeInterval = timeInterval |
197 else: | 197 else: |
198 commonTimeInterval = self.timeInterval | 198 commonTimeInterval = self.timeInterval |
199 self.collisionPoints, self.crossingZones = prediction.computeCrossingsCollisions(predictionParameters, self.roadUser1, self.roadUser2, collisionDistanceThreshold, timeHorizon, computeCZ, debug, commonTimeInterval, nProcesses,usePrototypes,route1,route2,prototypes,secondStepPrototypes,nMatching,objects,noiseEntryNums,noiseExitNums,minSimilarity,mostMatched,useDestination,useSpeedPrototype,acceptPartialLength, step) | 199 self.collisionPoints, self.crossingZones = predictionParameters.computeCrossingsCollisions(self.roadUser1, self.roadUser2, collisionDistanceThreshold, timeHorizon, computeCZ, debug, commonTimeInterval, nProcesses,usePrototypes,route1,route2,prototypes,secondStepPrototypes,nMatching,objects,noiseEntryNums,noiseExitNums,minSimilarity,mostMatched,useDestination,useSpeedPrototype,acceptPartialLength, step) |
200 for i, cp in self.collisionPoints.iteritems(): | 200 for i, cp in self.collisionPoints.iteritems(): |
201 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(cp) | 201 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(cp) |
202 # add probability of collision, and probability of successful evasive action | 202 # add probability of collision, and probability of successful evasive action |
203 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[7], TTCs)) | 203 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[7], TTCs)) |
204 | 204 |