Mercurial > hg > nsaunier > traffic-intelligence

comparison python/poly-utils.py @ 998:933670761a57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated code to python 3 (tests pass and scripts run, but non-executed parts of code are probably still not correct)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sun, 27 May 2018 23:22:48 -0400
parents 15e244d2a1b5
children
comparison
equal deleted inserted replaced
997:4f3387a242a1 998:933670761a57
21 data= np.loadtxt(filename) 21 data= np.loadtxt(filename)
22 indicatorFrameNums= data[:,0] 22 indicatorFrameNums= data[:,0]
23 inter = Interaction(interactionNum, TimeInterval(indicatorFrameNums[0],indicatorFrameNums[-1]), roaduserNum1, roaduserNum2) 23 inter = Interaction(interactionNum, TimeInterval(indicatorFrameNums[0],indicatorFrameNums[-1]), roaduserNum1, roaduserNum2)
24 inter.addVideoFilename(videoFilename) 24 inter.addVideoFilename(videoFilename)
25 inter.addInteractionType(interactionType) 25 inter.addInteractionType(interactionType)
26 for key in indicatorsNames.keys(): 26 for key in indicatorsNames:
27 values= {} 27 values= {}
28 for i,t in enumerate(indicatorFrameNums): 28 for i,t in enumerate(indicatorFrameNums):
29 values[t] = data[i,key] 29 values[t] = data[i,key]
30 inter.addIndicator(SeverityIndicator(indicatorsNames[key], values)) 30 inter.addIndicator(SeverityIndicator(indicatorsNames[key], values))
31 if selectedIndicators !=[]: 31 if selectedIndicators !=[]:
113 tmp = roadUserData[:,4] 113 tmp = roadUserData[:,4]
114 for k,v in zip(time, tmp): 114 for k,v in zip(time, tmp):
115 values[k]=v 115 values[k]=v
116 return SeverityIndicator(indicatorName, values, mostSevereIsMax = False, maxValue = 1.), roadUserData 116 return SeverityIndicator(indicatorName, values, mostSevereIsMax = False, maxValue = 1.), roadUserData
117 else: 117 else:
118 for i in xrange(time[0],time[-1]+1): 118 for i in range(time[0],time[-1]+1):
119 try: 119 try:
120 tmp = getDataAtInstant(roadUserData, i) 120 tmp = getDataAtInstant(roadUserData, i)
121 values[i] = np.sum(tmp[:,5]*tmp[:,6])/np.sum(tmp[:,5])/frameRate 121 values[i] = np.sum(tmp[:,5]*tmp[:,6])/np.sum(tmp[:,5])/frameRate
122 except IOError: 122 except IOError:
123 values[i] = np.inf 123 values[i] = np.inf