fulyvv/EasyMocap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict of assignment

Browse Source
This commit is contained in:
James Cotton 2022-09-22 15:16:49 +00:00
parent 7a8546e118
commit 3c6ddcf7a3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
easymocap/assignment/track.py
View File

@ -90,12 +90,16 @@ class BaseTrack:
# directly assign # directly assign
if id0 != -1 and id1 == -1: if id0 != -1 and id1 == -1:
if nf1 in frames_of_id[id0].keys(): if nf1 in frames_of_id[id0].keys():
log('Merge conflict') log(f'Merge conflict1 nf0: {nf0} ni0: {ni0} id0: {id0} nf1: {nf1} ni1: {ni1} id1: {id1}')
continue
results[nf1][ni1]['id'] = id0 results[nf1][ni1]['id'] = id0
# log('Merge person {}'.format(maxid)) # log('Merge person {}'.format(maxid))
frames_of_id[id0][nf1] = ni1 frames_of_id[id0][nf1] = ni1
continue continue
if id0 == -1 and id1 != -1: if id0 == -1 and id1 != -1:
if nf0 in frames_of_id[id1].keys():
log(f'Merge conflict2 nf0: {nf0} ni0: {ni0} id0: {id0} nf1: {nf1} ni1: {ni1} id1: {id1}')
continue
results[nf0][ni0]['id'] = id1 results[nf0][ni0]['id'] = id1
frames_of_id[id1][nf0] = ni0 frames_of_id[id1][nf0] = ni0
continue continue