# HG changeset patch
# User Jeep-Tour@Jeep-Tour-PC
# Date 1343061335 14400
# Node ID 44704f53ffc8a14b1ce61e753d647e6788837839
# Parent  933e400ee53b8e269d95a762ddbabecf9af552a1# Parent  99173da7afaefc3e90932f38e61a722d7faf0371
Fusion

diff -r 933e400ee53b -r 44704f53ffc8 python/moving.py
--- a/python/moving.py	Mon Jul 23 12:30:09 2012 -0400
+++ b/python/moving.py	Mon Jul 23 12:35:35 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:
diff -r 933e400ee53b -r 44704f53ffc8 python/tests/moving.txt
--- a/python/tests/moving.txt	Mon Jul 23 12:30:09 2012 -0400
+++ b/python/tests/moving.txt	Mon Jul 23 12:35:35 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))