Mercurial > hg > nsaunier > traffic-intelligence

comparison python/events.py @ 629:0a5e89d6fc62

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor cleaning
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Tue, 17 Feb 2015 00:56:47 +0100
parents 977407c9f815
children 69a98f84f3eb
comparison
equal deleted inserted replaced
628:977407c9f815 629:0a5e89d6fc62
190 TTCs = {} 190 TTCs = {}
191 if usePrototypes: 191 if usePrototypes:
192 route1= getRoute(self.roadUser1,prototypes,objects,noiseEntryNums,noiseExitNums,useDestination) 192 route1= getRoute(self.roadUser1,prototypes,objects,noiseEntryNums,noiseExitNums,useDestination)
193 route2= getRoute(self.roadUser2,prototypes,objects,noiseEntryNums,noiseExitNums,useDestination) 193 route2= getRoute(self.roadUser2,prototypes,objects,noiseEntryNums,noiseExitNums,useDestination)
194 194
195 if timeInterval: 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 = 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)
200 for i, cp in self.collisionPoints.iteritems(): 200 for i, cp in self.collisionPoints.iteritems():