Mercurial Hosting > traffic-intelligence
changeset 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 | c4363aa6f0e5 |
| children | ae137e3b1990 |
| files | python/events.py python/storage.py |
| diffstat | 2 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/python/events.py Tue Jun 30 17:56:14 2015 -0400 +++ b/python/events.py Thu Jul 09 00:58:08 2015 -0400 @@ -90,6 +90,8 @@ '', ''] + timeIndicators = ['Time to Collision', 'predicted Post Encroachment Time'] + def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): moving.STObject.__init__(self, num, timeInterval) if timeInterval is None and roadUser1 is not None and roadUser2 is not None:
--- 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]