Mercurial Hosting > traffic-intelligence
changeset 650:d74e8c175d6b
minor cleaning
| author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
|---|---|
| date | Thu, 16 Apr 2015 16:13:05 +0200 |
| parents | df9ddeaee4a6 |
| children | 335f6641bf7a |
| files | python/objectsmoothing.py |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/python/objectsmoothing.py Thu Apr 16 11:34:51 2015 +0200 +++ b/python/objectsmoothing.py Thu Apr 16 16:13:05 2015 +0200 @@ -1,6 +1,6 @@ import storage, moving, utils -from math import * #atan2,asin,degrees,sin,cos,pi -import numpy as np +from math import atan2, degrees, sin, cos, pi +from numpy import median import matplotlib.pyplot as plt @@ -67,7 +67,7 @@ return [dist,bearing1,bearing2,bearing2-bearing1] #Quantitative analysis "CSJ" functions -def computeVelocities(obj,smoothing=True,halfWidth=3): #compute velocities from positions +def computeVelocities(obj, smoothing=True, halfWidth=3): #compute velocities from positions velocities={} for i in list(obj.timeInterval)[:-1]: p1= obj.getPositionAtInstant(i) @@ -132,7 +132,7 @@ bearing[t]= getBearing(p1,p2,p3)[1] results.append(getBearing(p1,p2,p3)) - medianResults=np.median(results,0) + medianResults=median(results,0) dist= medianResults[0] angle= medianResults[3] @@ -204,7 +204,7 @@ xCoord.append(p1.x) yCoord.append(p1.y) if xCoord != []: - tmp= moving.Point(np.median(xCoord),np.median(yCoord)) + tmp= moving.Point(median(xCoord), median(yCoord)) newInterval.append(t) newTranslated.addPosition(tmp)