Mercurial > hg > nsaunier > traffic-intelligence

comparison python/events.py @ 695:957126bfb456 dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 0ceee3b1a96d
comparison
equal deleted inserted replaced
694:c4363aa6f0e5 695:957126bfb456
87 'm/s', 87 'm/s',
88 '', 88 '',
89 's', 89 's',
90 '', 90 '',
91 ''] 91 '']
92
93 timeIndicators = ['Time to Collision', 'predicted Post Encroachment Time']
92 94
93 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): 95 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None):
94 moving.STObject.__init__(self, num, timeInterval) 96 moving.STObject.__init__(self, num, timeInterval)
95 if timeInterval is None and roadUser1 is not None and roadUser2 is not None: 97 if timeInterval is None and roadUser1 is not None and roadUser2 is not None:
96 self.timeInterval = roadUser1.commonTimeInterval(roadUser2) 98 self.timeInterval = roadUser1.commonTimeInterval(roadUser2)