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

Merge pull request #101 from baojunshan/assugnment_bugs

Browse Source 
Three bugs from issue#99
This commit is contained in:
Qing Shuai 2021-11-10 15:06:15 +08:00 committed by GitHub
commit 7d0de3a603
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
easymocap/assignment/associate.py
View File

@ -18,7 +18,7 @@ def views_from_dimGroups(dimGroups):
def set_keypoints2d(indices, annots, Pall, dimGroups): def set_keypoints2d(indices, annots, Pall, dimGroups):
Vused = np.where(indices!=-1)[0] Vused = np.where(indices!=-1)[0]
if len(Vused) < 1: if len(Vused) < 1:
return [], [], [] return [], [], [], []
keypoints2d = np.stack([annots[nv][indices[nv]-dimGroups[nv]]['keypoints'].copy() for nv in Vused]) keypoints2d = np.stack([annots[nv][indices[nv]-dimGroups[nv]]['keypoints'].copy() for nv in Vused])
bboxes = np.stack([annots[nv][indices[nv]-dimGroups[nv]]['bbox'].copy() for nv in Vused]) bboxes = np.stack([annots[nv][indices[nv]-dimGroups[nv]]['bbox'].copy() for nv in Vused])
Pused = Pall[Vused] Pused = Pall[Vused]
@ -63,7 +63,7 @@ def simple_associate(annots, affinity, dimGroups, Pall, group, cfg):
p = proposal.copy() p = proposal.copy()
p[nv] = col p[nv] = col
proposals_new.append(p) proposals_new.append(p)
proposals = proposals_new proposals += proposals_new
results = [] results = []
while len(proposals) > 0: while len(proposals) > 0:
proposal = proposals.pop() proposal = proposals.pop()

2
easymocap/assignment/criterion.py
View File

@ -46,7 +46,7 @@ class CritLenTorso(BaseCrit):
if (keypoints3d[[self.src, self.dst], -1] < self.min_conf).all(): if (keypoints3d[[self.src, self.dst], -1] < self.min_conf).all():
# low confidence, skip # low confidence, skip
return True return True
length = np.linalg.norm(keypoints3d[self.dst] - keypoints3d[self.src]) length = np.linalg.norm(keypoints3d[self.dst, :3] - keypoints3d[self.src, :3])
self.log = '{}: {:.3f}'.format(self.name, length) self.log = '{}: {:.3f}'.format(self.name, length)
if length < self.min_torso_length or length > self.max_torso_length: if length < self.min_torso_length or length > self.max_torso_length:
return False return False