fixed detect and recognize example

justadudewhohacks · justadudewhohacks · commit bdfaba243b20 · 2018-06-10T15:21:54.000+02:00
diff --git a/examples/public/commons.js b/examples/public/commons.js
@@ -25,28 +25,39 @@ async function initFaceRecognitionNet() {
 }
 
 // fetch first image of each class and compute their descriptors
-async function initTrainDescriptorsByClass(net) {
+async function initTrainDescriptorsByClass(net, numImagesForTraining = 1) {
+  const maxAvailableImagesPerClass = 5
+  numImagesForTraining = Math.min(numImagesForTraining, maxAvailableImagesPerClass)
   return Promise.all(classes.map(
     async className => {
-      const img = await facerecognition.bufferToImage(
-        await fetchImage(getFaceImageUri(className, 1))
-      )
-      const descriptor = await net.computeFaceDescriptor(img)
+      const descriptors = []
+      for (let i = 1; i < (numImagesForTraining + 1); i++) {
+        const img = await facerecognition.bufferToImage(
+          await fetchImage(getFaceImageUri(className, i))
+        )
+        descriptors.push(await net.computeFaceDescriptor(img))
+      }
       return {
-        descriptor,
+        descriptors,
         className
       }
     }
   ))
 }
 
-function getBestMatch(allDescriptors, queryDescriptor) {
-  return allDescriptors
+function getBestMatch(descriptorsByClass, queryDescriptor) {
+  function computeMeanDistance(descriptorsOfClass) {
+    return facerecognition.round(
+      descriptorsOfClass
+        .map(d => facerecognition.euclideanDistance(d, queryDescriptor))
+        .reduce((d1, d2) => d1 + d2, 0)
+          / (descriptorsOfClass.length || 1)
+      )
+  }
+  return descriptorsByClass
     .map(
-      ({ descriptor, className }) => ({
-        distance: facerecognition.round(
-          facerecognition.euclideanDistance(descriptor, queryDescriptor)
-        ),
+      ({ descriptors, className }) => ({
+        distance: computeMeanDistance(descriptors),
         className
       })
     )
diff --git a/examples/views/detectAndRecognizeFaces.html b/examples/views/detectAndRecognizeFaces.html
@@ -41,7 +41,7 @@
   </div>
 
   <script>
-    const threshold = 0.6
+    const threshold = 0.8
     let minConfidence = 0.7
     let detectionNet, recognitionNet
     let trainDescriptorsByClass = []
@@ -71,7 +71,7 @@
       const detectionsForSize = detections.map(det => det.forSize(width, height))
       facerecognition.drawDetection('overlay', detectionsForSize, { withScore: false })
 
-      const faceTensors = await facerecognition.extractFaceTensors(input, detections)
+      const faceTensors = (await facerecognition.extractFaceTensors(input, detections))
       const descriptors = await Promise.all(faceTensors.map(t => recognitionNet.computeFaceDescriptor(t)))
 
       // free memory for face image tensors after we computed their descriptors
@@ -94,7 +94,7 @@
     async function run() {
       detectionNet = await initFaceDetectionNet()
       recognitionNet = await initFaceRecognitionNet()
-      trainDescriptorsByClass = await initTrainDescriptorsByClass(recognitionNet)
+      trainDescriptorsByClass = await initTrainDescriptorsByClass(recognitionNet, 1)
       $('#loader').hide()
       onSelectionChanged($('#selectList select').val())
     }
