Mercurial > hg > nsaunier > traffic-intelligence

comparison python/moving.py @ 1014:026f6b3b122c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Moving pull request2
author Wendlasida
date Fri, 01 Jun 2018 17:32:52 -0400
parents d6f121ded971 75af46516b2b
children 9b53be469a36
comparison
equal deleted inserted replaced
1013:d6f121ded971 1014:026f6b3b122c
1223 px+=vitessex 1223 px+=vitessex
1224 py+=vitessey 1224 py+=vitessey
1225 newObject = MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType()) 1225 newObject = MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType())
1226 newObject.features = [MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType())] #In case there is features to add when we recursively call concatenate 1226 newObject.features = [MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType())] #In case there is features to add when we recursively call concatenate
1227 return MovingObject.concatenate(MovingObject.concatenate(obj1, newObject),obj2) 1227 return MovingObject.concatenate(MovingObject.concatenate(obj1, newObject),obj2)
1228
1229 else: 1228 else:
1230 newTimeInterval = TimeInterval.union(obj1.getTimeInterval(), obj2.getTimeInterval()) 1229 newTimeInterval = TimeInterval.union(obj1.getTimeInterval(), obj2.getTimeInterval())
1231 # positions 1230 # positions
1232 positions = Trajectory() 1231 positions = Trajectory()
1233 for t in newTimeInterval: 1232 for t in newTimeInterval: