diff python/ubc_utils.py @ 43:6d11d9e7ad4e

methods for trajectories and objects to add and subtract trajectories and extract objects from existing objects, for sub-time intervals
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Wed, 14 Jul 2010 14:02:11 -0400
parents 1a2ac2d4f53a
children be3ae926e4e8
line wrap: on
line diff
--- a/python/ubc_utils.py	Thu Jul 01 10:44:32 2010 -0400
+++ b/python/ubc_utils.py	Wed Jul 14 14:02:11 2010 -0400
@@ -34,9 +34,9 @@
         obj = MovingObject(num = objNum, timeInterval = TimeInterval(parsedLine[1],parsedLine[2]))
         #add = True
         if len(lines) >= 3:
-            obj.positions = Trajectory(lines[1], lines[2])
+            obj.positions = Trajectory.load(lines[1], lines[2])
             if len(lines) >= 5:
-                obj.velocities = Trajectory(lines[3], lines[4])
+                obj.velocities = Trajectory.load(lines[3], lines[4])
                 if (isObjectFile):
                     obj.userType = parsedLine[3]
                     obj.nObjects = float(l[4])
@@ -45,8 +45,8 @@
                     # load contour data if available
                     if len(lines) >= 6:
                         obj.contourType = utils.line2Floats(lines[6])
-                        obj.contourOrigins = Trajectory(lines[7], lines[8])
-                        obj.contourSizes = Trajectory(lines[9], lines[10])
+                        obj.contourOrigins = Trajectory.load(lines[7], lines[8])
+                        obj.contourSizes = Trajectory.load(lines[9], lines[10])
 
         if len(lines) != 2:
             objects.append(obj)