# HG changeset patch
# User Nicolas Saunier <nicolas.saunier@polymtl.ca>
# Date 1406530679 14400
# Node ID 07b1bd0785cdce8d7bec0991d036b3fffd2508ab
# Parent  f86f5f25730a597881874124ed329bd3c8331210
simplifications to interactions

diff -r f86f5f25730a -r 07b1bd0785cd python/events.py
--- 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