Mercurial > hg > nsaunier > traffic-intelligence

comparison python/storage.py @ 526:21bdeb29f855

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug in initialization of lists and loading trajectories from vissim files
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 20 Jun 2014 17:45:32 -0400
parents 7124c7d2a663
children 37830a831818
comparison
equal deleted inserted replaced
525:7124c7d2a663 526:21bdeb29f855
442 if objNum not in objects: 442 if objNum not in objects:
443 objects[objNum] = moving.MovingObject(num = objNum, timeInterval = moving.TimeInterval(instant, instant)) 443 objects[objNum] = moving.MovingObject(num = objNum, timeInterval = moving.TimeInterval(instant, instant))
444 objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory() 444 objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory()
445 objects[objNum].timeInterval.last = instant 445 objects[objNum].timeInterval.last = instant
446 objects[objNum].curvilinearPositions.addPosition(s, y, lane) 446 objects[objNum].curvilinearPositions.addPosition(s, y, lane)
447 if nObjects > 0 and len(objects) > nObjects:
448 return objects.values()[:nObjects]
447 449
448 return objects.values() 450 return objects.values()
449 451
450 def loadTrajectoriesFromNgsimFile(filename, nObjects = -1, sequenceNum = -1): 452 def loadTrajectoriesFromNgsimFile(filename, nObjects = -1, sequenceNum = -1):
451 '''Reads data from the trajectory data provided by NGSIM project 453 '''Reads data from the trajectory data provided by NGSIM project