Mercurial Hosting > traffic-intelligence
changeset 701:4cc56ff82c3c dev
corrected bug for prediction at constant velocity, exact computation
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Fri, 17 Jul 2015 18:00:00 -0400 |
| parents | 0f1b6907643a |
| children | f0a897d7f3a5 |
| files | python/prediction.py |
| diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/python/prediction.py Fri Jul 17 14:33:01 2015 -0400 +++ b/python/prediction.py Fri Jul 17 18:00:00 2015 -0400 @@ -555,7 +555,7 @@ def __init__(self): PredictionParameters.__init__(self, 'constant velocity (direct exact computation)', None) - def computeCrossingsCollisionsAtInstant(self, currentInstant, obj1, obj2, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False): + def computeCrossingsCollisionsAtInstant(self, currentInstant, obj1, obj2, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, *kwargs): 'TODO add collision point coordinates, compute pPET' #collisionPoints = [] #crossingZones = [] @@ -569,9 +569,9 @@ if intersection is not None: ttc = moving.Point.timeToCollision(p1, p2, v1, v2, collisionDistanceThreshold) if ttc: - return [SafetyPoint(intersection, 1., ttc)], [] # (p1+v1.multiply(ttc)+p2+v2.multiply(ttc)).multiply(0.5) + return currentInstant, [SafetyPoint(intersection, 1., ttc)], [] # (p1+v1.multiply(ttc)+p2+v2.multiply(ttc)).multiply(0.5) else: - return [],[] + return currentInstant, [],[] #### # Other Methods