Mercurial > hg > nsaunier > traffic-intelligence
diff python/poly-utils.py @ 1012:01db14e947e4
resolved
| author | Wendlasida |
|---|---|
| date | Fri, 01 Jun 2018 10:47:49 -0400 |
| parents | 933670761a57 |
| children |
line wrap: on
line diff
--- a/python/poly-utils.py Fri Jun 01 10:43:23 2018 -0400 +++ b/python/poly-utils.py Fri Jun 01 10:47:49 2018 -0400 @@ -23,7 +23,7 @@ inter = Interaction(interactionNum, TimeInterval(indicatorFrameNums[0],indicatorFrameNums[-1]), roaduserNum1, roaduserNum2) inter.addVideoFilename(videoFilename) inter.addInteractionType(interactionType) - for key in indicatorsNames.keys(): + for key in indicatorsNames: values= {} for i,t in enumerate(indicatorFrameNums): values[t] = data[i,key] @@ -115,7 +115,7 @@ values[k]=v return SeverityIndicator(indicatorName, values, mostSevereIsMax = False, maxValue = 1.), roadUserData else: - for i in xrange(time[0],time[-1]+1): + for i in range(time[0],time[-1]+1): try: tmp = getDataAtInstant(roadUserData, i) values[i] = np.sum(tmp[:,5]*tmp[:,6])/np.sum(tmp[:,5])/frameRate
