Mercurial Hosting > traffic-intelligence
diff python/ubc_utils.py @ 286:fa95796a76b3
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 |
line wrap: on
line diff
--- a/python/ubc_utils.py Sat Jan 26 19:02:25 2013 -0500 +++ b/python/ubc_utils.py Sun Jan 27 00:22:55 2013 -0500 @@ -188,8 +188,9 @@ for indicatorNum,line in enumerate(lines[2:]): values = {} for i,v in enumerate([float(n) for n in line.split(' ')]): - values[indicatorFrameNums[i]] = v - inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum], ignoredValue[indicatorNum])) + if not ignoredValue[indicatorNum] or v != ignoredValue[indicatorNum]: + values[indicatorFrameNums[i]] = v + inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum])) interactions.append(inter) interactionNum+=1