mask labels fixed

This commit is contained in:
seranus 2021-12-06 22:33:52 +01:00
commit cbd78fbc8a
2 changed files with 12 additions and 3 deletions

View file

@ -305,7 +305,12 @@ class QModel(ModelBase):
st_m = []
for i in range(n_samples):
ar = label_face_filename(S[i]*target_srcm[i], filenames[0][i]), SS[i], label_face_filename(D[i]*target_dstm[i], filenames[1][i]), DD[i]*DDM[i], SD[i]*(DDM[i]*SDM[i])
SM = S[i]*target_srcm[i]
DM = D[i]*target_dstm[i]
if filenames is not None and len(filenames) > 0:
SM = label_face_filename(SM, filenames[0][i])
DM = label_face_filename(DM, filenames[0][i])
ar = SM, SS[i], DM, DD[i]*DDM[i], SD[i]*(DDM[i]*SDM[i])
st_m.append ( np.concatenate ( ar, axis=1) )
result += [ ('Quick96 masked', np.concatenate (st_m, axis=0 )), ]

View file

@ -982,8 +982,12 @@ Examples: df, liae, df-d, df-ud, liae-ud, ...
st_m = []
for i in range(n_samples):
SD_mask = DDM[i]*SDM[i] if self.face_type < FaceType.HEAD else SDM[i]
ar = label_face_filename(S[i]*target_srcm[i], filenames[0][i]), SS[i]*SSM[i], label_face_filename(D[i]*target_dstm[i], filenames[1][i]), DD[i]*DDM[i], SD[i]*SD_mask
SM = S[i]*target_srcm[i]
DM = D[i]*target_dstm[i]
if filenames is not None and len(filenames) > 0:
SM = label_face_filename(SM, filenames[0][i])
DM = label_face_filename(DM, filenames[0][i])
ar = SM, SS[i]*SSM[i], DM, DD[i]*DDM[i], SD[i]*SD_mask
st_m.append ( np.concatenate ( ar, axis=1) )
result += [ ('SAEHD masked', np.concatenate (st_m, axis=0 )), ]