Mercurial Hosting > traffic-intelligence
diff python/prediction.py @ 290:df58d361f19e
refactoring of Interval and TimeInterval using class methods (intersection, union)
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Tue, 29 Jan 2013 18:23:47 -0500 |
| parents | e56c34c1ebac |
| children | 9f81218e497a |
line wrap: on
line diff
--- a/python/prediction.py Tue Jan 29 11:21:42 2013 -0500 +++ b/python/prediction.py Tue Jan 29 18:23:47 2013 -0500 @@ -204,7 +204,7 @@ t, p1, p2 = computeCollisionTime(et1, et2, collisionDistanceThreshold, timeHorizon) if t <= timeHorizon: - collisionPoints.append(SafetyPoint((p1+p2).multiply(0.5), currentInstant, et1.probability*et2.probability, t)) + collisionPoints.append(SafetyPoint((p1+p2).multiply(0.5), et1.probability*et2.probability, t)) else: # check if there is a crossing zone # TODO? zone should be around the points at which the traj are the closest # look for CZ at different times, otherwise it would be a collision @@ -249,7 +249,7 @@ commonTimeInterval = obj1.commonTimeInterval(obj2) for i in list(commonTimeInterval)[:-1]: # do not look at the 1 last position/velocities, often with errors print(obj1.num, obj2.num, i) - collisionPoints[i], crossingZones[i] = computeCrossingsCollisionsAtInstant(obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, debug) + collisionPoints[i], crossingZones[i] = computeCrossingsCollisionsAtInstant(i, obj1, obj2, predictionParameters, collisionDistanceThreshold, timeHorizon, debug) return collisionPoints, crossingZones