fixed MTCNN forwardParams initialization for optional params

justadudewhohacks · justadudewhohacks · commit 1d133c541255 · 2018-07-14T12:50:52.000+02:00
diff --git a/src/globalApi.ts b/src/globalApi.ts
@@ -73,9 +73,9 @@ export function computeFaceDescriptor(
 
 export function mtcnn(
   input: TNetInput,
-  forwardParameters: MtcnnForwardParams = getDefaultMtcnnForwardParams()
+  forwardParams: MtcnnForwardParams
 ): Promise<MtcnnResult[]> {
-  return nets.mtcnn.forward(input, forwardParameters)
+  return nets.mtcnn.forward(input, forwardParams)
 }
 
 export const allFaces: (
diff --git a/src/mtcnn/Mtcnn.ts b/src/mtcnn/Mtcnn.ts
@@ -28,7 +28,7 @@ export class Mtcnn extends NeuralNetwork<NetParams> {
 
   public async forwardInput(
     input: NetInput,
-    { minFaceSize, scaleFactor, maxNumScales, scoreThresholds, scaleSteps } = getDefaultMtcnnForwardParams()
+    forwardParams: MtcnnForwardParams
   ): Promise<{ results: MtcnnResult[], stats: any }> {
 
     const { params } = this
@@ -64,6 +64,14 @@ export class Mtcnn extends NeuralNetwork<NetParams> {
 
     const [height, width] = imgTensor.shape.slice(1)
 
+    const {
+      minFaceSize,
+      scaleFactor,
+      maxNumScales,
+      scoreThresholds,
+      scaleSteps
+    } = Object.assign({}, getDefaultMtcnnForwardParams(), forwardParams)
+
     const scales = scaleSteps || pyramidDown(minFaceSize, scaleFactor, [height, width])
       .filter(scale => {
         const sizes = getSizesForScale(scale, [height, width])
@@ -124,23 +132,23 @@ export class Mtcnn extends NeuralNetwork<NetParams> {
 
   public async forward(
     input: TNetInput,
-    forwardParameters: MtcnnForwardParams = getDefaultMtcnnForwardParams()
+    forwardParams: MtcnnForwardParams
   ): Promise<MtcnnResult[]> {
     return (
       await this.forwardInput(
         await toNetInput(input, true, true),
-        forwardParameters
+        forwardParams
       )
     ).results
   }
 
   public async forwardWithStats(
     input: TNetInput,
-    forwardParameters: MtcnnForwardParams = getDefaultMtcnnForwardParams()
+    forwardParams: MtcnnForwardParams
   ): Promise<{ results: MtcnnResult[], stats: any }> {
     return this.forwardInput(
       await toNetInput(input, true, true),
-      forwardParameters
+      forwardParams
     )
   }
 
diff --git a/src/mtcnn/getDefaultMtcnnForwardParams.ts b/src/mtcnn/getDefaultMtcnnForwardParams.ts
@@ -1,6 +1,4 @@
-import { MtcnnForwardParams } from './types';
-
-export function getDefaultMtcnnForwardParams(): MtcnnForwardParams {
+export function getDefaultMtcnnForwardParams() {
   return {
     minFaceSize: 20,
     scaleFactor: 0.709,
diff --git a/src/mtcnn/types.ts b/src/mtcnn/types.ts
@@ -47,9 +47,9 @@ export type MtcnnResult = {
 }
 
 export type MtcnnForwardParams = {
-  minFaceSize: number
-  scaleFactor: number
-  maxNumScales: number
-  scoreThresholds: number[]
+  minFaceSize?: number
+  scaleFactor?: number
+  maxNumScales?: number
+  scoreThresholds?: number[]
   scaleSteps?: number[]
 }

Original file line number	Diff line number	Diff line change
`@@ -47,9 +47,9 @@ export type MtcnnResult = {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`export type MtcnnForwardParams = {`
`50`		`- minFaceSize: number`
`51`		`- scaleFactor: number`
`52`		`- maxNumScales: number`
`53`		`- scoreThresholds: number[]`
	`50`	`+ minFaceSize?: number`
	`51`	`+ scaleFactor?: number`
	`52`	`+ maxNumScales?: number`
	`53`	`+ scoreThresholds?: number[]`
`54`	`54`	`scaleSteps?: number[]`
`55`	`55`	`}`