Mercurial Hosting > traffic-intelligence
diff python/ubc_utils.py @ 306:93d851d0d21e
bug correction, minor work on indicators
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Tue, 02 Apr 2013 15:27:42 -0400 |
parents | 1f253f218b9f |
children | a70c205ebdd9 |
line wrap: on
line diff
--- a/python/ubc_utils.py Fri Mar 29 21:20:12 2013 -0400 +++ b/python/ubc_utils.py Tue Apr 02 15:27:42 2013 -0400 @@ -170,7 +170,7 @@ def loadInteractions(filename, nInteractions = -1): 'Loads interactions from the old UBC traffic event format' - from event import Interaction + from events import Interaction from indicators import SeverityIndicator file = utils.openCheck(filename) if (not file): @@ -184,7 +184,6 @@ inter = Interaction(interactionNum, TimeInterval(parsedLine[1],parsedLine[2]), parsedLine[3], parsedLine[4], categoryNum = parsedLine[5]) indicatorFrameNums = [int(n) for n in lines[1].split(' ')] - inter.indicators = [] for indicatorNum,line in enumerate(lines[2:]): values = {} for i,v in enumerate([float(n) for n in line.split(' ')]):