Mercurial Hosting > traffic-intelligence
diff python/prediction.py @ 296:586ead03fc00
added option to disable computation of crossing zones
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 11 Feb 2013 16:01:15 -0500 |
| parents | ba29bd82bd04 |
| children | f65b828e5521 |
line wrap: on
line diff
--- 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