Mercurial Hosting > traffic-intelligence

changeset 566:07b1bd0785cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplifications to interactions
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Mon, 28 Jul 2014 02:57:59 -0400
parents f86f5f25730a
children 072cedc3f33d
files python/events.py
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/python/events.py	Thu Jul 24 01:06:34 2014 -0400
+++ b/python/events.py	Mon Jul 28 02:57:59 2014 -0400
@@ -62,9 +62,16 @@
 
     def __init__(self, num = None, timeInterval = None, roaduserNum1 = None, roaduserNum2 = None, roadUser1 = None, roadUser2 = None, categoryNum = None):
         moving.STObject.__init__(self, num, timeInterval)
-        self.roadUserNumbers = set([roaduserNum1, roaduserNum2])
+        if timeInterval == None and roadUser1 != None and roadUser2 != None:
+            self.timeInterval = roadUser1.commonTimeInterval(roadUser2)
         self.roadUser1 = roadUser1
         self.roadUser2 = roadUser2
+        if roaduserNum1 != None and roaduserNum2 != None:
+            self.roadUserNumbers = set([roaduserNum1, roaduserNum2])
+        elif roadUser1 != None and roadUser2 != None:
+            self.roadUserNumbers = set(roadUser1.getNum(), roadUser2.getNum())
+        else:
+            self.roadUserNumbers = None
         self.categoryNum = categoryNum
         self.indicators = {}
         self.interactionInterval = None