Mercurial Hosting > traffic-intelligence
diff python/moving.py @ 1014:026f6b3b122c
Moving pull request2
author | Wendlasida |
---|---|
date | Fri, 01 Jun 2018 17:32:52 -0400 |
parents | d6f121ded971 75af46516b2b |
children | 9b53be469a36 |
line wrap: on
line diff
--- a/python/moving.py Fri Jun 01 17:29:01 2018 -0400 +++ b/python/moving.py Fri Jun 01 17:32:52 2018 -0400 @@ -1225,7 +1225,6 @@ newObject = MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType()) newObject.features = [MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType())] #In case there is features to add when we recursively call concatenate return MovingObject.concatenate(MovingObject.concatenate(obj1, newObject),obj2) - else: newTimeInterval = TimeInterval.union(obj1.getTimeInterval(), obj2.getTimeInterval()) # positions