diff python/tests/moving.txt @ 959:4f32d82ca390

corrected error due to change in Hog (scikit image)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Thu, 24 Aug 2017 17:22:24 -0400
parents d8ab183a7351
children f026ce2af637
line wrap: on
line diff
--- a/python/tests/moving.txt	Fri Aug 18 18:00:11 2017 -0400
+++ b/python/tests/moving.txt	Thu Aug 24 17:22:24 2017 -0400
@@ -203,13 +203,13 @@
 >>> gt1 = BBMovingObject(1, TimeInterval(0,10), MovingObject.generate(1, Point(0.2,0.6), Point(1.,0.), TimeInterval(0,10)), MovingObject.generate(2, Point(-0.2,-0.4), Point(1.,0.), TimeInterval(0,10)))
 >>> gt1.computeCentroidTrajectory()
 >>> computeClearMOT([gt1], [], 0.2, 0, 10)
-(None, 0.0, 11, 0, 0, 11)
+(None, 0.0, 11, 0, 0, 11, None, None)
 >>> computeClearMOT([], [o1], 0.2, 0, 10)
-(None, None, 0, 0, 11, 0)
+(None, None, 0, 0, 11, 0, None, None)
 >>> computeClearMOT([gt1], [o1], 0.2, 0, 10) # doctest:+ELLIPSIS
-(0.0999..., 1.0, 0, 0, 0, 11)
+(0.0999..., 1.0, 0, 0, 0, 11, None, None)
 >>> computeClearMOT([gt1], [o1], 0.05, 0, 10)
-(None, -1.0, 11, 0, 11, 11)
+(None, -1.0, 11, 0, 11, 11, None, None)
 
 >>> o1 = MovingObject(1, TimeInterval(0,3), positions = Trajectory([range(4), [0.1, 0.1, 1.1, 1.1]]))
 >>> o2 = MovingObject(2, TimeInterval(0,3), positions = Trajectory([range(4), [0.9, 0.9, -0.1, -0.1]]))
@@ -218,16 +218,16 @@
 >>> gt2 = BBMovingObject(2, TimeInterval(0,3), MovingObject(positions = Trajectory([range(4), [1.]*4])), MovingObject(positions = Trajectory([range(4), [1.]*4])))
 >>> gt2.computeCentroidTrajectory()
 >>> computeClearMOT([gt1, gt2], [o1, o2], 0.2, 0, 3) # doctest:+ELLIPSIS
-(0.1..., 0.75, 0, 2, 0, 8)
+(0.1..., 0.75, 0, 2, 0, 8, None, None)
 >>> computeClearMOT([gt2, gt1], [o2, o1], 0.2, 0, 3) # doctest:+ELLIPSIS
-(0.1..., 0.75, 0, 2, 0, 8)
+(0.1..., 0.75, 0, 2, 0, 8, None, None)
 >>> computeClearMOT([gt1], [o1, o2], 0.2, 0, 3)
-(0.1, -0.25, 0, 1, 4, 4)
+(0.1, -0.25, 0, 1, 4, 4, None, None)
 >>> computeClearMOT([gt1], [o2, o1], 0.2, 0, 3) # symmetry
-(0.1, -0.25, 0, 1, 4, 4)
+(0.1, -0.25, 0, 1, 4, 4, None, None)
 >>> computeClearMOT([gt1, gt2], [o1], 0.2, 0, 3) # doctest:+ELLIPSIS
-(0.100..., 0.375, 4, 1, 0, 8)
+(0.100..., 0.375, 4, 1, 0, 8, None, None)
 >>> computeClearMOT([gt2, gt1], [o1], 0.2, 0, 3) # doctest:+ELLIPSIS
-(0.100..., 0.375, 4, 1, 0, 8)
+(0.100..., 0.375, 4, 1, 0, 8, None, None)
 >>> computeClearMOT([gt1, gt2], [o1, o2], 0.08, 0, 3)
-(None, -1.0, 8, 0, 8, 8)
+(None, -1.0, 8, 0, 8, 8, None, None)