Mercurial > hg > nsaunier > traffic-intelligence

comparison python/events.py @ 692:9a258687af4c dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected some errors for ttc
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 29 Jun 2015 23:09:58 -0400
parents fa9aa5f08210
children c4363aa6f0e5
comparison
equal deleted inserted replaced
691:fa9aa5f08210 692:9a258687af4c
215 else: 215 else:
216 commonTimeInterval = self.timeInterval 216 commonTimeInterval = self.timeInterval
217 self.collisionPoints, 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) 217 self.collisionPoints, 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)
218 for i, cp in self.collisionPoints.iteritems(): 218 for i, cp in self.collisionPoints.iteritems():
219 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(cp) 219 TTCs[i] = prediction.SafetyPoint.computeExpectedIndicator(cp)
220 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[7], TTCs, mostSevereIsMax=False)) 220 if len(TTCs) > 0:
221 self.addIndicator(indicators.SeverityIndicator(Interaction.indicatorNames[7], TTCs, mostSevereIsMax=False))
221 222
222 # crossing zones and pPET 223 # crossing zones and pPET
223 if computeCZ: 224 if computeCZ:
224 self.crossingZones[predictionParameters.name] = crossingZones 225 self.crossingZones[predictionParameters.name] = crossingZones
225 pPETs = {} 226 pPETs = {}