Mercurial Hosting > traffic-intelligence
changeset 249:99173da7afae
corrected small bugs and typos
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Sat, 21 Jul 2012 00:50:42 -0400 |
| parents | 571ba5ed22e2 |
| children | 59f547aebaac 44704f53ffc8 |
| files | python/moving.py python/tests/moving.txt |
| diffstat | 2 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/python/moving.py Wed Jul 18 02:54:22 2012 -0400 +++ b/python/moving.py Sat Jul 21 00:50:42 2012 -0400 @@ -231,7 +231,7 @@ def predictPosition(nTimeSteps, initialPosition, initialVelocity, initialAcceleration = Point(0,0)): '''Predicts the position in nTimeSteps at constant speed/acceleration''' - return initalPosition+velocity.multiply(nTimeSteps) + initialAcceleration.multiply(nTimeSteps**2) + return initialPosition+initialVelocity.multiply(nTimeSteps) + initialAcceleration.multiply(nTimeSteps**2) class FlowVector:
--- a/python/tests/moving.txt Wed Jul 18 02:54:22 2012 -0400 +++ b/python/tests/moving.txt Sat Jul 21 00:50:42 2012 -0400 @@ -37,8 +37,8 @@ 2 >>> TimeInterval(20,30).distance(TimeInterval(3,15)) 5 ->>> Interval.union([TimeInterval(3,6), TimeInterval(8,10),TimeInterval(11,15)]) -[3,15] +>>> unionIntervals([TimeInterval(3,6), TimeInterval(8,10),TimeInterval(11,15)]) +[3, 15] >>> Point(3,4)-Point(1,7) (2.000000,-3.000000) @@ -54,6 +54,9 @@ >>> Point(3,2).inPolygon([Point(0,0),Point(4,0),Point(4,3),Point(0,3)]) True +>>> predictPosition(10, Point(0,0), Point(1,1)) # doctest:+ELLIPSIS +(10...,10...) + >>> segmentIntersection(Point(0,0),Point(1,1), Point(0,1), Point(1,2)) >>> segmentIntersection(Point(0,1),Point(1,0), Point(0,2), Point(2,1)) >>> segmentIntersection(Point(0,0),Point(2,0), Point(1,-1),Point(1,1))