Mercurial Hosting > traffic-intelligence
comparison python/ubc_utils.py @ 294:1f253f218b9f
evolution of indicators and their computation in interactions
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Fri, 08 Feb 2013 18:35:24 -0500 |
parents | fa95796a76b3 |
children | 93d851d0d21e |
comparison
equal
deleted
inserted
replaced
293:ee3302528cdc | 294:1f253f218b9f |
---|---|
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 if not ignoredValue[indicatorNum] or v != ignoredValue[indicatorNum]: | 191 if not ignoredValue[indicatorNum] or v != ignoredValue[indicatorNum]: |
192 values[indicatorFrameNums[i]] = v | 192 values[indicatorFrameNums[i]] = v |
193 inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum])) | 193 inter.addIndicator(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum])) |
194 | 194 |
195 interactions.append(inter) | 195 interactions.append(inter) |
196 interactionNum+=1 | 196 interactionNum+=1 |
197 lines = utils.getLines(file) | 197 lines = utils.getLines(file) |
198 | 198 |