Mercurial Hosting > traffic-intelligence
diff python/ubc_utils.py @ 25:28e546861263
added Point class and modified trajectory accordingly
author | Nicolas Saunier <nico@confins.net> |
---|---|
date | Sat, 05 Dec 2009 12:08:25 -0500 |
parents | 9d6831cfe675 |
children | 1a2ac2d4f53a |
line wrap: on
line diff
--- a/python/ubc_utils.py Sat Dec 05 11:04:03 2009 -0500 +++ b/python/ubc_utils.py Sat Dec 05 12:08:25 2009 -0500 @@ -33,11 +33,9 @@ obj = MovingObject(num = objNum, timeInterval = TimeInterval(parsedLine[1],parsedLine[2])) add = True if (len(lines) >= 3): - obj.positions = Trajectory([[float(n) for n in lines[1].split(' ')], - [float(n) for n in lines[2].split(' ')]]) + obj.positions = Trajectory(lines[1], lines[2]) if (len(lines) >= 5): - obj.velocities = Trajectory([[float(n) for n in lines[3].split(' ')], - [float(n) for n in lines[4].split(' ')]]) + obj.velocities = Trajectory(lines[3], lines[4]) if len(lines) != 2: objects.append(obj)