Update NoFitRasterGpuCalculatorHelper.ts.

Author: mcai

src/gpu/GPUHelper.ts

@@ -2,7 +2,7 @@ import { GPU, GPUMode } from "gpu.js";
 import { SimpleFormatting } from "../utils/SimpleFormatting";
 import moment from "moment";
 
-export function time(name: string, func: () => any) {
+export function time(name: (result: any) => string, func: () => any) {
     const start = new Date().getTime();
 
     const result = func();
@@ -12,7 +12,7 @@ export function time(name: string, func: () => any) {
 
     const now = SimpleFormatting.toFormattedDateTimeString(moment());
 
-    console.log(`[${now}] ${name} 用时${time}毫秒`);
+    console.log(`[${now}] ${name(result)} 用时${time}毫秒`);
 
     return result;
 }
@@ -51,8 +51,14 @@ function test() {
         .fill([])
         .map(() => Array<number>(k).fill(Math.random()));
 
-    const resultGPU = time(`GPU_${m}_${n}_${k}`, () => GPUHelper.test("gpu", m, n, k, a, b));
-    const resultCPU = time(`CPU_${m}_${n}_${k}`, () => GPUHelper.test("cpu", m, n, k, a, b));
+    const resultGPU = time(
+        () => `GPU_${m}_${n}_${k}`,
+        () => GPUHelper.test("gpu", m, n, k, a, b),
+    );
+    const resultCPU = time(
+        () => `CPU_${m}_${n}_${k}`,
+        () => GPUHelper.test("cpu", m, n, k, a, b),
+    );
 
     for (let i = 0; i < m; i++) {
         for (let j = 0; j < k; j++) {

src/gpu/NoFitRasterGpuCalculatorHelperServer.ts

@@ -25,8 +25,10 @@ export class NoFitRasterGpuCalculatorHelperServer {
             const orbitingPolygon = JSON.parse(orbitingPolygonJson as any);
 
             const result = time(
-                `noFitPolygon:固定配件:${stationaryPolygon.length}个顶点,` +
-                    `自由配件:${orbitingPolygon.length}个顶点,`,
+                (result: any) =>
+                    `noFitPolygon:固定配件:${stationaryPolygon.length}个顶点,` +
+                    `自由配件:${orbitingPolygon.length}个顶点,` +
+                    `结果:${result.length}个顶点,`,
                 () =>
                     noFitPolygon(
                         stationaryPolygon.map((dot: any) => [dot.X, dot.Y]),
@@ -46,7 +48,8 @@ export class NoFitRasterGpuCalculatorHelperServer {
             const orbitingDotsMinimumPoint = JSON.parse(orbitingDotsMinimumPointJson as any);
 
             const result = time(
-                `noFitRaster:板材:${boardDots.length}个顶点,` +
+                () =>
+                    `noFitRaster:板材:${boardDots.length}个顶点,` +
                     `固定配件:${stationaryDots.length}个顶点,` +
                     `自由配件:${orbitingDots.length}个顶点,`,
                 () =>
@@ -67,11 +70,13 @@ export class NoFitRasterGpuCalculatorHelperServer {
             const a = JSON.parse(aJson as any);
             const b = JSON.parse(bJson as any);
 
-            const result = time(`rasterDifference,a:${a.length}个顶点,b:${b.length}个顶点,`, () =>
-                NoFitRasterGpuCalculatorHelper.rasterDifference(
-                    a.map((dot: any) => [dot.X, dot.Y]),
-                    b.map((dot: any) => [dot.X, dot.Y]),
-                ),
+            const result = time(
+                (result) => `rasterDifference,a:${a.length}个顶点,b:${b.length}个顶点,结果:${result.length}个顶点`,
+                () =>
+                    NoFitRasterGpuCalculatorHelper.rasterDifference(
+                        a.map((dot: any) => [dot.X, dot.Y]),
+                        b.map((dot: any) => [dot.X, dot.Y]),
+                    ),
             );
 
             return res.json(result.map((dot: any) => ({ X: dot[0], Y: dot[1] })));

src/utils/Settings.ts

@@ -1 +1 @@
-export const gapBetweenDots: number = 5.0;
+export const gapBetweenDots: number = 3.0;