Mercurial Hosting > traffic-intelligence
diff python/storage.py @ 542:a3add9f751ef
added differentiate function for curvilinear trajectories and modified the addPosition functions
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Mon, 07 Jul 2014 16:54:10 -0400 |
| parents | 048b43654870 |
| children | b5525249eda1 |
line wrap: on
line diff
--- a/python/storage.py Mon Jul 07 12:30:46 2014 -0400 +++ b/python/storage.py Mon Jul 07 16:54:10 2014 -0400 @@ -452,7 +452,7 @@ objects[objNum].curvilinearPositions = moving.CurvilinearTrajectory() if (warmUpLastInstant == None or firstInstants[objNum] >= warmUpLastInstant) and objNum in objects: objects[objNum].timeInterval.last = instant - objects[objNum].curvilinearPositions.addPosition(s, y, lane) + objects[objNum].curvilinearPositions.addPositionSYL(s, y, lane) return objects.values() @@ -504,7 +504,7 @@ else: obj.laneNums.append(int(numbers[13])) obj.positions.addPositionXY(float(numbers[6]), float(numbers[7])) - obj.curvilinearPositions.addPosition(float(numbers[5]), float(numbers[4]), obj.laneNums[-1]) + obj.curvilinearPositions.addPositionSYL(float(numbers[5]), float(numbers[4]), obj.laneNums[-1]) obj.speeds.append(float(numbers[11])) obj.precedingVehicles.append(int(numbers[14])) obj.followingVehicles.append(int(numbers[15]))