Mercurial Hosting > traffic-intelligence
changeset 111:48e3de4acb65
corrected bugs in file copying functions and added utility to get concatenate feature numbers for a set of objects
author | Nicolas Saunier <nico@confins.net> |
---|---|
date | Fri, 15 Jul 2011 19:51:31 -0400 |
parents | fae55a4c7a5a |
children | 67555e968b5e |
files | python/ubc_utils.py |
diffstat | 1 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- 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