# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1319655878 14400
# Node ID 319a04ba9033f652044071e87e993266ffc62183
# Parent  e508bb0cbb64de80048ae3e064b61e59d8a38a35
function name change

diff -r e508bb0cbb64 -r 319a04ba9033 python/storage.py
--- 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 = []