faceapi.round -> faceapi.utils.round

justadudewhohacks · justadudewhohacks · commit 0b4470af97be · 2019-12-14T17:36:25.000+01:00
diff --git a/examples/examples-browser/public/js/faceDetectionControls.js b/examples/examples-browser/public/js/faceDetectionControls.js
@@ -26,13 +26,13 @@ function getFaceDetectorOptions() {
 }
 
 function onIncreaseMinConfidence() {
-  minConfidence = Math.min(faceapi.round(minConfidence + 0.1), 1.0)
+  minConfidence = Math.min(faceapi.utils.round(minConfidence + 0.1), 1.0)
   $('#minConfidence').val(minConfidence)
   updateResults()
 }
 
 function onDecreaseMinConfidence() {
-  minConfidence = Math.max(faceapi.round(minConfidence - 0.1), 0.1)
+  minConfidence = Math.max(faceapi.utils.round(minConfidence - 0.1), 0.1)
   $('#minConfidence').val(minConfidence)
   updateResults()
 }
@@ -51,24 +51,24 @@ function changeInputSize(size) {
 }
 
 function onIncreaseScoreThreshold() {
-  scoreThreshold = Math.min(faceapi.round(scoreThreshold + 0.1), 1.0)
+  scoreThreshold = Math.min(faceapi.utils.round(scoreThreshold + 0.1), 1.0)
   $('#scoreThreshold').val(scoreThreshold)
   updateResults()
 }
 
 function onDecreaseScoreThreshold() {
-  scoreThreshold = Math.max(faceapi.round(scoreThreshold - 0.1), 0.1)
+  scoreThreshold = Math.max(faceapi.utils.round(scoreThreshold - 0.1), 0.1)
   $('#scoreThreshold').val(scoreThreshold)
   updateResults()
 }
 
 function onIncreaseMinFaceSize() {
-  minFaceSize = Math.min(faceapi.round(minFaceSize + 20), 300)
+  minFaceSize = Math.min(faceapi.utils.round(minFaceSize + 20), 300)
   $('#minFaceSize').val(minFaceSize)
 }
 
 function onDecreaseMinFaceSize() {
-  minFaceSize = Math.max(faceapi.round(minFaceSize - 20), 50)
+  minFaceSize = Math.max(faceapi.utils.round(minFaceSize - 20), 50)
   $('#minFaceSize').val(minFaceSize)
 }
 
diff --git a/examples/examples-browser/views/ageAndGenderRecognition.html b/examples/examples-browser/views/ageAndGenderRecognition.html
@@ -161,8 +161,8 @@
         const { age, gender, genderProbability } = result
         new faceapi.draw.DrawTextField(
           [
-            `${faceapi.round(age, 0)} years`,
-            `${gender} (${faceapi.round(genderProbability)})`
+            `${faceapi.utils.round(age, 0)} years`,
+            `${gender} (${faceapi.utils.round(genderProbability)})`
           ],
           result.detection.box.bottomLeft
         ).draw(canvas)
diff --git a/examples/examples-browser/views/bbtFaceMatching.html b/examples/examples-browser/views/bbtFaceMatching.html
@@ -96,7 +96,7 @@
 
     function displayTimeStats(timeInMs) {
       $('#time').val(`${timeInMs} ms`)
-      $('#fps').val(`${faceapi.round(1000 / timeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / timeInMs)}`)
     }
 
     function displayImage(src) {
diff --git a/examples/examples-browser/views/bbtFaceSimilarity.html b/examples/examples-browser/views/bbtFaceSimilarity.html
@@ -39,7 +39,7 @@
     let descriptors = { desc1: null, desc2: null }
 
     function updateResult() {
-      const distance = faceapi.round(
+      const distance = faceapi.utils.round(
         faceapi.euclideanDistance(descriptors.desc1, descriptors.desc2)
       )
       let text = distance
diff --git a/examples/examples-browser/views/videoFaceTracking.html b/examples/examples-browser/views/videoFaceTracking.html
@@ -156,7 +156,7 @@
       forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)
       const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length
       $('#time').val(`${Math.round(avgTimeInMs)} ms`)
-      $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
     }
 
     async function onPlay(videoEl) {
diff --git a/examples/examples-browser/views/webcamAgeAndGenderRecognition.html b/examples/examples-browser/views/webcamAgeAndGenderRecognition.html
@@ -152,7 +152,7 @@
       forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)
       const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length
       $('#time').val(`${Math.round(avgTimeInMs)} ms`)
-      $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
     }
 
     function interpolateAgePredictions(age) {
@@ -192,8 +192,8 @@
         const interpolatedAge = interpolateAgePredictions(age)
         new faceapi.draw.DrawTextField(
           [
-            `${faceapi.round(interpolatedAge, 0)} years`,
-            `${gender} (${faceapi.round(genderProbability)})`
+            `${faceapi.utils.round(interpolatedAge, 0)} years`,
+            `${gender} (${faceapi.utils.round(genderProbability)})`
           ],
           result.detection.box.bottomLeft
         ).draw(canvas)
diff --git a/examples/examples-browser/views/webcamFaceDetection.html b/examples/examples-browser/views/webcamFaceDetection.html
@@ -139,7 +139,7 @@
       forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)
       const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length
       $('#time').val(`${Math.round(avgTimeInMs)} ms`)
-      $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
     }
 
     async function onPlay() {
diff --git a/examples/examples-browser/views/webcamFaceExpressionRecognition.html b/examples/examples-browser/views/webcamFaceExpressionRecognition.html
@@ -151,7 +151,7 @@
       forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)
       const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length
       $('#time').val(`${Math.round(avgTimeInMs)} ms`)
-      $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
     }
 
     async function onPlay() {
diff --git a/examples/examples-browser/views/webcamFaceLandmarkDetection.html b/examples/examples-browser/views/webcamFaceLandmarkDetection.html
@@ -151,7 +151,7 @@
       forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)
       const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length
       $('#time').val(`${Math.round(avgTimeInMs)} ms`)
-      $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
+      $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
     }
 
     async function onPlay() {
diff --git a/examples/examples-nodejs/ageAndGenderRecognition.ts b/examples/examples-nodejs/ageAndGenderRecognition.ts
@@ -19,8 +19,8 @@ async function run() {
     const { age, gender, genderProbability } = result
     new faceapi.draw.DrawTextField(
       [
-        `${faceapi.round(age, 0)} years`,
-        `${gender} (${faceapi.round(genderProbability)})`
+        `${faceapi.utils.round(age, 0)} years`,
+        `${gender} (${faceapi.utils.round(genderProbability)})`
       ],
       result.detection.box.bottomLeft
     ).draw(out)

Original file line number	Diff line number	Diff line change
`@@ -26,13 +26,13 @@ function getFaceDetectorOptions() {`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`function onIncreaseMinConfidence() {`
`29`		`- minConfidence = Math.min(faceapi.round(minConfidence + 0.1), 1.0)`
	`29`	`+ minConfidence = Math.min(faceapi.utils.round(minConfidence + 0.1), 1.0)`
`30`	`30`	`$('#minConfidence').val(minConfidence)`
`31`	`31`	`updateResults()`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`function onDecreaseMinConfidence() {`
`35`		`- minConfidence = Math.max(faceapi.round(minConfidence - 0.1), 0.1)`
	`35`	`+ minConfidence = Math.max(faceapi.utils.round(minConfidence - 0.1), 0.1)`
`36`	`36`	`$('#minConfidence').val(minConfidence)`
`37`	`37`	`updateResults()`
`38`	`38`	`}`
`@@ -51,24 +51,24 @@ function changeInputSize(size) {`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`function onIncreaseScoreThreshold() {`
`54`		`- scoreThreshold = Math.min(faceapi.round(scoreThreshold + 0.1), 1.0)`
	`54`	`+ scoreThreshold = Math.min(faceapi.utils.round(scoreThreshold + 0.1), 1.0)`
`55`	`55`	`$('#scoreThreshold').val(scoreThreshold)`
`56`	`56`	`updateResults()`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`function onDecreaseScoreThreshold() {`
`60`		`- scoreThreshold = Math.max(faceapi.round(scoreThreshold - 0.1), 0.1)`
	`60`	`+ scoreThreshold = Math.max(faceapi.utils.round(scoreThreshold - 0.1), 0.1)`
`61`	`61`	`$('#scoreThreshold').val(scoreThreshold)`
`62`	`62`	`updateResults()`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`function onIncreaseMinFaceSize() {`
`66`		`- minFaceSize = Math.min(faceapi.round(minFaceSize + 20), 300)`
	`66`	`+ minFaceSize = Math.min(faceapi.utils.round(minFaceSize + 20), 300)`
`67`	`67`	`$('#minFaceSize').val(minFaceSize)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`function onDecreaseMinFaceSize() {`
`71`		`- minFaceSize = Math.max(faceapi.round(minFaceSize - 20), 50)`
	`71`	`+ minFaceSize = Math.max(faceapi.utils.round(minFaceSize - 20), 50)`
`72`	`72`	`$('#minFaceSize').val(minFaceSize)`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@`
`96`	`96`
`97`	`97`	`function displayTimeStats(timeInMs) {`
`98`	`98`	$('#time').val(`${timeInMs} ms`)
`99`		- $('#fps').val(`${faceapi.round(1000 / timeInMs)}`)
	`99`	+ $('#fps').val(`${faceapi.utils.round(1000 / timeInMs)}`)
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`function displayImage(src) {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`let descriptors = { desc1: null, desc2: null }`
`40`	`40`
`41`	`41`	`function updateResult() {`
`42`		`- const distance = faceapi.round(`
	`42`	`+ const distance = faceapi.utils.round(`
`43`	`43`	`faceapi.euclideanDistance(descriptors.desc1, descriptors.desc2)`
`44`	`44`	`)`
`45`	`45`	`let text = distance`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@`
`156`	`156`	`forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)`
`157`	`157`	`const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length`
`158`	`158`	$('#time').val(`${Math.round(avgTimeInMs)} ms`)
`159`		- $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
	`159`	+ $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`async function onPlay(videoEl) {`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@`
`139`	`139`	`forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)`
`140`	`140`	`const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length`
`141`	`141`	$('#time').val(`${Math.round(avgTimeInMs)} ms`)
`142`		- $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
	`142`	+ $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`async function onPlay() {`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@`
`151`	`151`	`forwardTimes = [timeInMs].concat(forwardTimes).slice(0, 30)`
`152`	`152`	`const avgTimeInMs = forwardTimes.reduce((total, t) => total + t) / forwardTimes.length`
`153`	`153`	$('#time').val(`${Math.round(avgTimeInMs)} ms`)
`154`		- $('#fps').val(`${faceapi.round(1000 / avgTimeInMs)}`)
	`154`	+ $('#fps').val(`${faceapi.utils.round(1000 / avgTimeInMs)}`)
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`async function onPlay() {`