Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 339:9c1818a71c9c
minor
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 19 Jun 2013 22:56:21 -0400 |
parents | f3aceea2afbb |
children | 1046b7346886 |
comparison
equal
deleted
inserted
replaced
338:f3aceea2afbb | 339:9c1818a71c9c |
---|---|
33 'Minimum Distance', | 33 'Minimum Distance', |
34 'Speed Differential'] | 34 'Speed Differential'] |
35 | 35 |
36 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): | 36 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): |
37 moving.STObject.__init__(self, num, timeInterval) | 37 moving.STObject.__init__(self, num, timeInterval) |
38 self.roaduserNumbers = set([roaduserNum1, roaduserNum2]) | 38 self.roadUserNumbers = set([roaduserNum1, roaduserNum2]) |
39 self.roadUser1 = roadUser1 | 39 self.roadUser1 = roadUser1 |
40 self.roadUser2 = roadUser2 | 40 self.roadUser2 = roadUser2 |
41 self.categoryNum = categoryNum | 41 self.categoryNum = categoryNum |
42 self.indicators = {} | 42 self.indicators = {} |
43 | 43 |
88 self.addIndicator(indicators.SeverityIndicator('Minimum Distance', minDistance)) | 88 self.addIndicator(indicators.SeverityIndicator('Minimum Distance', minDistance)) |
89 | 89 |
90 def computeCrossingsCollisions(self, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None): | 90 def computeCrossingsCollisions(self, predictionParameters, collisionDistanceThreshold, timeHorizon, computeCZ = False, debug = False, timeInterval = None): |
91 '''Computes all crossing and collision points at each common instant for two road users. ''' | 91 '''Computes all crossing and collision points at each common instant for two road users. ''' |
92 self.collisionPoints={} | 92 self.collisionPoints={} |
93 self.crossingZones={} | |
93 TTCs = {} | 94 TTCs = {} |
94 if computeCZ: | |
95 self.crossingZones={} | |
96 | 95 |
97 if timeInterval: | 96 if timeInterval: |
98 commonTimeInterval = timeInterval | 97 commonTimeInterval = timeInterval |
99 else: | 98 else: |
100 commonTimeInterval = self.timeInterval | 99 commonTimeInterval = self.timeInterval |