Mercurial Hosting > traffic-intelligence
changeset 784:30bd0f2223b7 dev
tweaking curvilinear trajectory loading
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Thu, 03 Mar 2016 14:31:13 -0500 |
parents | f1040d739bbf |
children | 3aa6102ccc12 |
files | python/storage.py |
diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/python/storage.py Wed Mar 02 17:50:05 2016 -0500 +++ b/python/storage.py Thu Mar 03 14:31:13 2016 -0500 @@ -267,16 +267,19 @@ printDBError(error) return [] + missingObjectNumbers = [] objNum = None for row in cursor: if objNum != row[0]: objNum = row[0] - if objNum < len(objects): + if objNum in objects: objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory() else: - print('There are more curvilinear trajectories than objects') - break - objects[objNum].curvilinearPositions.addPositionSYL(row[2],row[3],row[4]) + missingObjectNumbers.append(objNum) + if objNum in objects: + objects[objNum].curvilinearPositions.addPositionSYL(row[2],row[3],row[4]) + if len(missingObjectNumbers) > 0: + print('List of missing objects to attach corresponding curvilinear trajectories: {}'.format(missingObjectNumbers)) def saveTrajectoriesToSqlite(outputFilename, objects, trajectoryType, withFeatures = False): '''Writes features, ie the trajectories positions (and velocities if exist)