Mercurial Hosting > traffic-intelligence
diff python/ubc_utils.py @ 67:ded58c424783
added indicator computation and modified severity indicator constructor
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Sun, 07 Nov 2010 04:21:26 -0500 |
parents | 290fceb125d2 |
children | fae55a4c7a5a |
line wrap: on
line diff
--- a/python/ubc_utils.py Sun Nov 07 01:34:43 2010 -0500 +++ b/python/ubc_utils.py Sun Nov 07 04:21:26 2010 -0500 @@ -140,13 +140,12 @@ inter = Interaction(interactionNum, TimeInterval(parsedLine[1],parsedLine[2]), parsedLine[3], parsedLine[4], categoryNum = parsedLine[5]) indicatorFrameNums = [int(n) for n in lines[1].split(' ')] - indicators = [] + inter.indicators = [] for indicatorNum,line in enumerate(lines[2:]): values = {} for i,v in enumerate([float(n) for n in line.split(' ')]): values[indicatorFrameNums[i]] = v - indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, mostSevereIsMax[indicatorNum], ignoredValue[indicatorNum])) - inter.indicators = indicators + inter.indicators.append(SeverityIndicator(severityIndicatorNames[indicatorNum], values, None, mostSevereIsMax[indicatorNum], ignoredValue[indicatorNum])) interactions.append(inter) interactionNum+=1