Mercurial Hosting > traffic-intelligence

diff 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
line wrap: on
line diff
--- a/python/events.py	Thu Apr 18 15:46:21 2013 -0400
+++ b/python/events.py	Thu Apr 18 17:12:53 2013 -0400
@@ -77,7 +77,7 @@
 
     def computeCollisionPoints(self, predictionParameters, collisionDistanceThreshold, timeHorizon):
         if self.movingObject1.features and self.movingObject2.features:
-            collisionPoints = prediction.computeCollisions(self.movingObject1, self.movingObject2, predictionParameters, collisionDistanceThreshold, timeHorizon)
+            collisionPoints,crossingZones = prediction.computeCrossingsCollisions(self.movingObject1, self.movingObject2, predictionParameters, collisionDistanceThreshold, timeHorizon,asWholeVehicle=True)
             self.addIndicator(indicators.SeverityIndicator('collisionPoints', collisionPoints))	
         else:
             print('Features not associated with objects')