change arrayAsync

javyxx · javyxx · commit 4c7fb27f0c7b · 2019-03-18T18:12:37.000+01:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/mtcnn/stage2.ts b/src/mtcnn/stage2.ts
@@ -54,13 +54,15 @@ export async function stage2(
     )
     stats.stage2_nms = Date.now() - ts
 
-    const regions = indicesNms.map(idx =>
-      new MtcnnBox(
-        rnetOuts[indices[idx]].regions.arraySync()[0][0],
-        rnetOuts[indices[idx]].regions.arraySync()[0][1],
-        rnetOuts[indices[idx]].regions.arraySync()[0][2],
-        rnetOuts[indices[idx]].regions.arraySync()[0][3]
-      )
+    const regions = indicesNms.map(idx =>{
+        const regionsData = rnetOuts[indices[idx]].regions.arraySync()
+        return new MtcnnBox(
+          regionsData[0][0],
+          regionsData[0][1],
+          regionsData[0][2],
+          regionsData[0][3]
+        )
+      }
     )
 
     finalScores = indicesNms.map(idx => filteredScores[idx])
diff --git a/src/mtcnn/stage3.ts b/src/mtcnn/stage3.ts
@@ -39,12 +39,14 @@ export async function stage3(
     .filter(c => c.score > scoreThreshold)
     .map(({ idx }) => idx)
 
-  const filteredRegions = indices.map(idx => new MtcnnBox(
-    onetOuts[idx].regions.arraySync()[0][0],
-    onetOuts[idx].regions.arraySync()[0][1],
-    onetOuts[idx].regions.arraySync()[0][2],
-    onetOuts[idx].regions.arraySync()[0][3]
-  ))
+  const filteredRegions = indices.map(idx => {
+    const regionsData = onetOuts[idx].regions.arraySync();
+    return new MtcnnBox(
+      regionsData[0][0],
+      regionsData[0][1],
+      regionsData[0][2],
+      regionsData[0][3]
+  )})
   const filteredBoxes = indices
     .map((idx, i) => inputBoxes[idx].calibrate(filteredRegions[i]))
   const filteredScores = indices.map(idx => scores[idx])
@@ -67,11 +69,13 @@ export async function stage3(
     finalBoxes = indicesNms.map(idx => filteredBoxes[idx])
     finalScores = indicesNms.map(idx => filteredScores[idx])
     points = indicesNms.map((idx, i) =>
-      Array(5).fill(0).map((_, ptIdx) =>
-        new Point(
-          ((onetOuts[idx].points.arraySync()[0][ptIdx] * (finalBoxes[i].width + 1)) + finalBoxes[i].left) ,
-          ((onetOuts[idx].points.arraySync()[0][ptIdx+5] * (finalBoxes[i].height + 1)) + finalBoxes[i].top)
-        )
+      Array(5).fill(0).map((_, ptIdx) =>{
+          const pointsData = onetOuts[idx].points.arraySync()
+          return new Point(
+            ((pointsData[0][ptIdx] * (finalBoxes[i].width + 1)) + finalBoxes[i].left) ,
+            ((pointsData[0][ptIdx+5] * (finalBoxes[i].height + 1)) + finalBoxes[i].top)
+          )
+        }
       )
     )
   }
