Mercurial Hosting > traffic-intelligence
changeset 148:ad21db62b785
bug correction for cosine functions in python
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Thu, 01 Sep 2011 16:44:23 -0400 |
parents | 0089fb29cd26 |
children | 0f552c8b1650 |
files | python/moving.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/python/moving.py Tue Aug 30 13:38:31 2011 -0400 +++ b/python/moving.py Thu Sep 01 16:44:23 2011 -0400 @@ -425,14 +425,14 @@ 'A positive result indicates that the road users are getting closer' deltap = movingObject1.getPositionAtInstant(instant)-movingObject2.getPositionAtInstant(instant) deltav = movingObject2.getVelocityAtInstant(instant)-movingObject1.getVelocityAtInstant(instant) - return moving.Point.dot(deltap, deltav) + return Point.dot(deltap, deltav) @staticmethod def collisionCourseCosine(movingObject1, movingObject2, instant): 'A positive result indicates that the road users are getting closer' deltap = movingObject1.getPositionAtInstant(instant)-movingObject2.getPositionAtInstant(instant) deltav = movingObject2.getVelocityAtInstant(instant)-movingObject1.getVelocityAtInstant(instant) - return moving.Point.dot(deltap, deltav)/(deltap.norm2()*deltav.norm2()) + return Point.dot(deltap, deltav)/(deltap.norm2()*deltav.norm2()) def plotRoadUsers(objects, colors): '''Colors is a PlottingPropertyValues instance'''