Mercurial Hosting > traffic-intelligence
comparison python/events.py @ 566:07b1bd0785cd
simplifications to interactions
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Mon, 28 Jul 2014 02:57:59 -0400 |
parents | 806df5f61c03 |
children | 84690dfe5560 |
comparison
equal
deleted
inserted
replaced
565:f86f5f25730a | 566:07b1bd0785cd |
---|---|
60 '', | 60 '', |
61 ''] | 61 ''] |
62 | 62 |
63 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): | 63 def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None): |
64 moving.STObject.__init__(self, num, timeInterval) | 64 moving.STObject.__init__(self, num, timeInterval) |
65 self.roadUserNumbers = set([roaduserNum1, roaduserNum2]) | 65 if timeInterval == None and roadUser1 != None and roadUser2 != None: |
66 self.timeInterval = roadUser1.commonTimeInterval(roadUser2) | |
66 self.roadUser1 = roadUser1 | 67 self.roadUser1 = roadUser1 |
67 self.roadUser2 = roadUser2 | 68 self.roadUser2 = roadUser2 |
69 if roaduserNum1 != None and roaduserNum2 != None: | |
70 self.roadUserNumbers = set([roaduserNum1, roaduserNum2]) | |
71 elif roadUser1 != None and roadUser2 != None: | |
72 self.roadUserNumbers = set(roadUser1.getNum(), roadUser2.getNum()) | |
73 else: | |
74 self.roadUserNumbers = None | |
68 self.categoryNum = categoryNum | 75 self.categoryNum = categoryNum |
69 self.indicators = {} | 76 self.indicators = {} |
70 self.interactionInterval = None | 77 self.interactionInterval = None |
71 | 78 |
72 def getRoadUserNumbers(self): | 79 def getRoadUserNumbers(self): |