Mercurial > hg > nsaunier > traffic-intelligence

comparison python/moving.py @ 1003:75af46516b2b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
work in progress
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Fri, 01 Jun 2018 17:19:31 -0400
parents cc7c6b821ae6
children 026f6b3b122c
comparison
equal deleted inserted replaced
1002:6c5ce3ec497e 1003:75af46516b2b
1182 px+=vitessex 1182 px+=vitessex
1183 py+=vitessey 1183 py+=vitessey
1184 1184
1185 newObject = MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType()) 1185 newObject = MovingObject(newNum, emptyInterval, positions, velocities, userType = obj1.getUserType())
1186 return MovingObject.concatenate(MovingObject.concatenate(obj1, newObject),obj2) 1186 return MovingObject.concatenate(MovingObject.concatenate(obj1, newObject),obj2)
1187
1188 else: 1187 else:
1189 newTimeInterval = TimeInterval.union(obj1.getTimeInterval(), obj2.getTimeInterval()) 1188 newTimeInterval = TimeInterval.union(obj1.getTimeInterval(), obj2.getTimeInterval())
1190 # positions 1189 # positions
1191 if computePositions: # TODO it would probably be better to recompute from all features, if features are available, in other method 1190 if computePositions: # TODO it would probably be better to recompute from all features, if features are available, in other method
1192 positions = Trajectory() 1191 positions = Trajectory()