Mercurial Hosting > traffic-intelligence
changeset 173:319a04ba9033
function name change
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Wed, 26 Oct 2011 15:04:38 -0400 |
| parents | e508bb0cbb64 |
| children | ec9734015d53 |
| files | python/storage.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/python/storage.py Tue Oct 25 19:01:21 2011 -0400 +++ b/python/storage.py Wed Oct 26 15:04:38 2011 -0400 @@ -11,7 +11,7 @@ 'car':2, 'truck':3} -def loadSqlite(filename, objectNumbers = -1): +def loadTrajectoriesFromSqlite(filename, objectNumbers = -1): '''Loads nObjects or the indices in objectNumbers from the database TODO: load velocities''' import sqlite3 @@ -48,7 +48,7 @@ connection.close() return objects -def loadNgsimFile(filename, nObjects = -1, sequenceNum = -1): +def loadTrajectoriesFromNgsimFile(filename, nObjects = -1, sequenceNum = -1): '''Reads data from the trajectory data provided by NGSIM project and returns the list of Feature objects''' objects = []