Mercurial > hg > nsaunier > traffic-intelligence

comparison python/events.py @ 600:414b2e7cd873

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge feature-minDistance-based collisionPoints calculation in prediction file
author Mohamed Gomaa
date Thu, 18 Apr 2013 17:12:53 -0400
parents 4b5fe2de1e8d
children e1f3b789c632
comparison
equal deleted inserted replaced
599:4b5fe2de1e8d 600:414b2e7cd873
75 minDistance[instant] = distance.min() 75 minDistance[instant] = distance.min()
76 self.addIndicator(indicators.SeverityIndicator('Minimum Distance', minDistance)) 76 self.addIndicator(indicators.SeverityIndicator('Minimum Distance', minDistance))
77 77
78 def computeCollisionPoints(self, predictionParameters, collisionDistanceThreshold, timeHorizon): 78 def computeCollisionPoints(self, predictionParameters, collisionDistanceThreshold, timeHorizon):
79 if self.movingObject1.features and self.movingObject2.features: 79 if self.movingObject1.features and self.movingObject2.features:
80 collisionPoints = prediction.computeCollisions(self.movingObject1, self.movingObject2, predictionParameters, collisionDistanceThreshold, timeHorizon) 80 collisionPoints,crossingZones = prediction.computeCrossingsCollisions(self.movingObject1, self.movingObject2, predictionParameters, collisionDistanceThreshold, timeHorizon,asWholeVehicle=True)
81 self.addIndicator(indicators.SeverityIndicator('collisionPoints', collisionPoints)) 81 self.addIndicator(indicators.SeverityIndicator('collisionPoints', collisionPoints))
82 else: 82 else:
83 print('Features not associated with objects') 83 print('Features not associated with objects')
84 84
85 def addVideoFilename(self,videoFilename): 85 def addVideoFilename(self,videoFilename):