# HG changeset patch
# User Nicolas Saunier <nico@confins.net>
# Date 1310773891 14400
# Node ID 48e3de4acb656f8354c433380d6d7dbf6b1c44cc
# Parent  fae55a4c7a5abeb3960de3261d0b82d65ae21cf4
corrected bugs in file copying functions and added utility to get concatenate feature numbers for a set of objects

diff -r fae55a4c7a5a -r 48e3de4acb65 python/ubc_utils.py
--- a/python/ubc_utils.py	Fri Jul 15 15:49:32 2011 -0400
+++ b/python/ubc_utils.py	Fri Jul 15 19:51:31 2011 -0400
@@ -85,7 +85,7 @@
     fileIn = utils.openCheck(filenameIn, 'r', True)
     fileOut = utils.openCheck(filenameOut, "w", True)
 
-    lines = getLines(fileIn)
+    lines = utils.getLines(fileIn)
     trajNum = 0
     while (lines != []):
         modifiedLines = modifyLines(trajNum, lines)
@@ -93,7 +93,7 @@
             for l in modifiedLines:
                 fileOut.write(l+"\n")
             fileOut.write(utils.delimiterChar+"\n")
-        lines = getLines(fileIn)
+        lines = utils.getLines(fileIn)
         trajNum += 1
          
     fileIn.close()
@@ -105,14 +105,14 @@
     fileIn = utils.openCheck(filenameIn, 'r', True)
     fileOut = utils.openCheck(filenameOut, "w", True)
 
-    lines = getLines(fileIn)
+    lines = utils.getLines(fileIn)
     trajNum = 0
     while (lines != []):
         if keepTrajectory(trajNum, lines):
-            for l in modifiedLines:
+            for l in lines:
                 fileOut.write(l+"\n")
             fileOut.write(utils.delimiterChar+"\n")
-        lines = getLines(fileIn)
+        lines = utils.getLines(fileIn)
         trajNum += 1
         
     fileIn.close()
@@ -163,6 +163,12 @@
     file.close()
     return objects
    
+def getFeatureNumbers(objects):
+    featureNumbers=[]
+    for o in objects:
+        featureNumbers += o.featureNumbers
+    return featureNumbers
+
 def loadInteractions(filename, nInteractions = -1):
     'Loads interactions from the old UBC traffic event format'
     from event import Interaction