Mercurial > hg > nsaunier > traffic-intelligence

comparison python/ubc_utils.py @ 286:fa95796a76b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplified indicators (only non-measured values, whether measurable or not)
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sun, 27 Jan 2013 00:22:55 -0500
parents ea2a8e8e4e77
children 1f253f218b9f
comparison
equal deleted inserted replaced
285:5957aa1d69e1 286:fa95796a76b3
186 indicatorFrameNums = [int(n) for n in lines[1].split(' ')] 186 indicatorFrameNums = [int(n) for n in lines[1].split(' ')]
187 inter.indicators = [] 187 inter.indicators = []
188 for indicatorNum,line in enumerate(lines[2:]): 188 for indicatorNum,line in enumerate(lines[2:]):
189 values = {} 189 values = {}
190 for i,v in enumerate([float(n) for n in line.split(' ')]): 190 for i,v in enumerate([float(n) for n in line.split(' ')]):
191 values[indicatorFrameNums[i]] = v 191 if not ignoredValue[indicatorNum] or v != ignoredValue[indicatorNum]:
192 inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum], ignoredValue[indicatorNum])) 192 values[indicatorFrameNums[i]] = v
193 inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum]))
193 194
194 interactions.append(inter) 195 interactions.append(inter)
195 interactionNum+=1 196 interactionNum+=1
196 lines = utils.getLines(file) 197 lines = utils.getLines(file)
197 198