Mercurial Hosting > traffic-intelligence
diff python/storage.py @ 695:957126bfb456 dev
corrected bug with indicator loading(also now correctly loading mostsevereismax)
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Thu, 09 Jul 2015 00:58:08 -0400 |
parents | 5ee22bf7e4d5 |
children | f0a897d7f3a5 |
line wrap: on
line diff
--- a/python/storage.py Tue Jun 30 17:56:14 2015 -0400 +++ b/python/storage.py Thu Jul 09 00:58:08 2015 -0400 @@ -537,10 +537,10 @@ interactions.append(events.Interaction(interactionNum, moving.TimeInterval(row[3],row[4]), row[1], row[2])) interactions[-1].indicators = {} if indicatorTypeNum != row[5] or row[0] != interactionNum: + indicatorTypeNum = row[5] indicatorName = events.Interaction.indicatorNames[indicatorTypeNum] indicatorValues = {row[6]:row[7]} - interactions[-1].indicators[indicatorName] = indicators.SeverityIndicator(indicatorName, indicatorValues) - indicatorTypeNum = row[5] + interactions[-1].indicators[indicatorName] = indicators.SeverityIndicator(indicatorName, indicatorValues, mostSevereIsMax = not indicatorName in events.Interaction.timeIndicators) else: indicatorValues[row[6]] = row[7] interactions[-1].indicators[indicatorName].timeInterval.last = row[6]