OrgLion-ML
/
openface
mirror of https://github.com/cmusatyalab/openface.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Web demo: Fix edge case in server.py 

+ This resolves #20.
+ Edge case is when just a single person is known.
This commit is contained in:
Brandon Amos 2015-10-17 14:18:24 -04:00
parent f615d6b532
commit 8538293804
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/web/server.py
View File

@ -58,7 +58,7 @@ parser.add_argument('--dlibFacePredictor', type=str, help="Path to dlib's face p
default=os.path.join(dlibModelDir, "shape_predictor_68_face_landmarks.dat")) default=os.path.join(dlibModelDir, "shape_predictor_68_face_landmarks.dat"))
parser.add_argument('--dlibRoot', type=str, parser.add_argument('--dlibRoot', type=str,
default=os.path.expanduser( default=os.path.expanduser(
"~/src/dlib-18.15/python_examples"), "~/src/dlib-18.16/python_examples"),
help="dlib directory with the dlib.so Python library.") help="dlib directory with the dlib.so Python library.")
parser.add_argument('--networkModel', type=str, help="Path to Torch network model.", parser.add_argument('--networkModel', type=str, help="Path to Torch network model.",
default=os.path.join(openfaceModelDir, 'nn4.v1.t7')) default=os.path.join(openfaceModelDir, 'nn4.v1.t7'))
@ -299,7 +299,15 @@ class OpenFaceServerProtocol(WebSocketServerProtocol):
} }
self.sendMessage(json.dumps(msg)) self.sendMessage(json.dumps(msg))
else: else:
identity = self.svm.predict(rep)[0] if self.svm else -1 if len(self.people) == 0:
identity = -1
elif len(self.people) == 1:
identity = 0
elif self.svm:
identity = self.svm.predict(rep)[0]
else:
print("hhh")
identity = -1
if identity not in identities: if identity not in identities:
identities.append(identity) identities.append(identity)