# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1360616475 18000
# Node ID 586ead03fc0080ea07f5089d191188366d79fd9c
# Parent  ba29bd82bd04d54a811bb987940b0e28aeccc04a
added option to disable computation of crossing zones

diff -r ba29bd82bd04 -r 586ead03fc00 python/prediction.py
--- a/python/prediction.py	Mon Feb 11 15:59:15 2013 -0500
+++ b/python/prediction.py	Mon Feb 11 16:01:15 2013 -0500
@@ -239,7 +239,7 @@
 
     return collisionPoints, crossingZones
     
-def computeCrossingsCollisions(obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, debug = False, timeInterval = None):
+def computeCrossingsCollisions(obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None):
     '''Computes all crossing and collision points at each common instant for two road users. '''
     collisionPoints={}
     crossingZones={}
@@ -248,7 +248,7 @@
     else:
         commonTimeInterval = obj1.commonTimeInterval(obj2)
     for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors
-        collisionPoints[i], crossingZones[i] = computeCrossingsCollisionsAtInstant(i, obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, debug)
+        collisionPoints[i], crossingZones[i] = computeCrossingsCollisionsAtInstant(i, obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ, debug)
 
     return collisionPoints, crossingZones