--- a/python/tests/moving.txt	Wed Jul 18 02:54:02 2012 -0400
+++ b/python/tests/moving.txt	Wed Jul 18 02:54:22 2012 -0400
@@ -29,6 +29,17 @@
 >>> TimeInterval(2,5).equal(TimeInterval(5,2))
 False
 
+>>> TimeInterval(3,6).distance(TimeInterval(4,6))
+0
+>>> TimeInterval(3,6).distance(TimeInterval(6,10))
+0
+>>> TimeInterval(3,6).distance(TimeInterval(8,10))
+2
+>>> TimeInterval(20,30).distance(TimeInterval(3,15))
+5
+>>> Interval.union([TimeInterval(3,6), TimeInterval(8,10),TimeInterval(11,15)])
+[3,15]
+
 >>> Point(3,4)-Point(1,7)
 (2.000000,-3.000000)
 
@@ -36,7 +47,7 @@
 13
 
 >>> Point.distanceNorm2(Point(3,4),Point(1,7))
-3.6055512754639891
+3.605551275463989
 
 >>> Point(3,2).inPolygon([Point(0,0),Point(1,0),Point(1,1),Point(0,1)])
 False
@@ -60,23 +71,3 @@
 (0.500000,0.500000)
 >>> t1.getTrajectoryInPolygon(np.array([[10,10],[14,10],[14,13],[10,13]])).length()
 0
-
->>> indic1 = TemporalIndicator('bla', [0,3,-4], TimeInterval(4,6))
->>> indic1.empty()
-False
->>> indic1[5]
-3
->>> indic1[3]
->>> [v for v in indic1]
-[0, 3, -4]
->>> indic1 = TemporalIndicator('bla', {2:0,4:3,5:-5})
->>> indic1[4]
-3
->>> indic1[3]
->>> [v for v in indic1]
-[0, 3, -5]
-
->>> indicatorMap([1,2,3], t1, 1)
-{(1.0, 3.0): 2.0, (2.0, 6.0): 3.0, (0.0, 0.0): 1.0}
->>> indicatorMap([1,2,3], t1, 4)
-{(0.0, 1.0): 3.0, (0.0, 0.0): 1.5}