Mercurial Hosting > traffic-intelligence

comparison trafficintelligence/moving.py @ 1180:dc28364f34b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor cleanup
author Nicolas Saunier <nicolas.saunier@polymtl.ca>
date Sun, 27 Mar 2022 00:54:12 -0400
parents 2039df59c47b
children b3b1a5dfa17c
comparison
equal deleted inserted replaced
1179:2039df59c47b 1180:dc28364f34b9
1324 if num is None: 1324 if num is None:
1325 newNum = obj1.getNum() 1325 newNum = obj1.getNum()
1326 else: 1326 else:
1327 newNum = num 1327 newNum = num
1328 commonTimeInterval = obj1.commonTimeInterval(obj2) 1328 commonTimeInterval = obj1.commonTimeInterval(obj2)
1329 emptyInterval = TimeInterval(min(obj1.getLastInstant(),obj2.getLastInstant()), max(obj1.getFirstInstant(),obj2.getFirstInstant())) 1329 if commonTimeInterval.empty(): # and emptyInterval.length() >= 2: not needed 2 to include situations successive positions, but issues with missing last velocity and reloading
1330 if commonTimeInterval.empty() and emptyInterval.length() >= 2: # 2 to include situations successive positions, but issues with missing last velocity and reloading 1330 emptyInterval = TimeInterval(min(obj1.getLastInstant(),obj2.getLastInstant()), max(obj1.getFirstInstant(),obj2.getFirstInstant()))
1331 if newFeatureNum is None: 1331 if newFeatureNum is None:
1332 print('Not merging objects {} and {}, missing new feature number'.format(obj1.getNum(),obj2.getNum())) 1332 print('Not merging objects {} and {}, missing new feature number'.format(obj1.getNum(),obj2.getNum()))
1333 return None, None 1333 return None, None
1334 else: 1334 else:
1335 if obj1.existsAtInstant(emptyInterval.last): 1335 if obj1.existsAtInstant(emptyInterval.last):