@woosh/meep-engine 2.93.3 → 2.94.1

package/src/generation/filtering/numeric/complex/CellFilterGaussianBlur.js

@@ -1,118 +1,45 @@
 import { assert } from "../../../../core/assert.js";
-import { gaussian } from "../../../../core/math/gaussian.js";
-import { makeNextOdd } from "../../../../core/math/makeNextOdd.js";
+import { build_gaussian_kernel_2d } from "../../../../core/math/build_gaussian_kernel_2d.js";
 import { max2 } from "../../../../core/math/max2.js";
+import { nextOdd } from "../../../../core/math/nextOdd.js";
 import { CellFilter } from "../../CellFilter.js";
 
-/**
- * Build gaussian 2d kernel
- * @param {number[]} result
- * @param {number} samplesX
- * @param {number} samplesY
- * @param {number} sigma_x
- * @param {number} sigma_y
- * @return {number}
- */
-function buildKernel(
-    result,
-    samplesX, samplesY,
-    sigma_x, sigma_y
-) {
-    assert.isNonNegativeInteger(samplesX, 'samplesX');
-    assert.isNonNegativeInteger(samplesY, 'samplesY');
-
-    const half_samples_x = (samplesX - 1) * 0.5;
-    const half_samples_y = (samplesY - 1) * 0.5;
-
-    let powerTotal = 0;
-    let ix, iy;
-
-    const i_samples_x = samplesX | 0;
-
-    for (iy = 0; iy < samplesY; iy++) {
-        const local_y = iy - half_samples_y;
-
-        const fy = gaussian(sigma_y, local_y);
-
-        for (ix = 0; ix < samplesX; ix++) {
-
-            const local_x = ix - half_samples_x;
-
-            const fx = gaussian(sigma_x, local_x);
-
-
-            const power = fx * fy;
+export class CellFilterGaussianBlur extends CellFilter {
+    samples_x = 5;
+    samples_y = 5;
 
-            powerTotal += power;
+    sigma_x = 10;
+    sigma_y = 10;
 
-            result[iy * i_samples_x + ix] = power;
-        }
-    }
+    /**
+     *
+     * @type {CellFilter}
+     */
+    source = null;
 
-    const inv_total_power = 1 / powerTotal;
+    size_x = 1;
+    size_y = 1;
 
-    // normalize kernel
-    for (let i = 0; i < samplesX * samplesY; i++) {
-        result[i] *= inv_total_power;
-    }
+    /**
+     *
+     * @type {Float32Array}
+     * @private
+     */
+    __kernel = new Float32Array(0);
 
-    return 1;
-}
+    /**
+     * Written by 'initialize' stage
+     * @type {number}
+     * @private
+     */
+    __local_u_scale = 0;
 
-export class CellFilterGaussianBlur extends CellFilter {
-    constructor() {
-        super();
-
-        this.samples_x = 5;
-        this.samples_y = 5;
-
-        this.sigma_x = 10;
-        this.sigma_y = 10;
-
-        /**
-         *
-         * @type {CellFilter}
-         */
-        this.source = null;
-
-        this.size_x = 1;
-        this.size_y = 1;
-
-        /**
-         *
-         * @type {number[]|ArrayLike<number>}
-         * @private
-         */
-        this.__kernel = [];
-
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__kernel_total_power = 0;
-
-        /**
-         *
-         * @type {number}
-         * @private
-         */
-        this.__inv_kernel_total_power = 0;
-
-        /**
-         * Written by 'initialize' stage
-         * @type {number}
-         * @private
-         */
-        this.__local_u_scale = 0;
-
-        /**
-         * Written by 'initialize' stage
-         * @type {number}
-         * @private
-         */
-        this.__local_v_scale = 0;
-    }
+    /**
+     * Written by 'initialize' stage
+     * @type {number}
+     * @private
+     */
+    __local_v_scale = 0;
 
     initialize(grid, seed) {
         if (this.initialized) {
@@ -123,10 +50,13 @@ export class CellFilterGaussianBlur extends CellFilter {
             this.source.initialize(grid, seed);
         }
 
+        assert.isNonNegativeInteger(this.samples_x, 'samples_x');
+        assert.isNonNegativeInteger(this.samples_y, 'samples_y');
+
         this.__kernel = new Float32Array(this.samples_x * this.samples_y);
 
         // initialize kernel
-        this.__kernel_total_power = buildKernel(this.__kernel, this.samples_x, this.samples_y, this.sigma_x, this.sigma_y);
+        build_gaussian_kernel_2d(this.__kernel, this.samples_x, this.samples_y, this.sigma_x, this.sigma_y);
 
 
         // precompute scaling for the sampling(execute) stage
@@ -150,8 +80,8 @@ export class CellFilterGaussianBlur extends CellFilter {
 
         r.source = source;
 
-        r.samples_x = max2(3, makeNextOdd(Math.round(quality * x)));
-        r.samples_y = max2(3, makeNextOdd(Math.round(quality * y)));
+        r.samples_x = max2(3, nextOdd(Math.round(quality * x)));
+        r.samples_y = max2(3, nextOdd(Math.round(quality * y)));
 
         r.size_x = x;
         r.size_y = y;
@@ -181,14 +111,12 @@ export class CellFilterGaussianBlur extends CellFilter {
         const source = this.source;
         const kernel = this.__kernel;
 
-        const i_samples_x = samplesX | 0;
-
         for (; iy < samplesY; iy++) {
             const local_y = iy - half_samples_y;
 
             const sample_y = y + local_y * local_v_scale;
 
-            const row_address = iy * i_samples_x;
+            const row_address = iy * samplesX;
 
             for (ix = 0; ix < samplesX; ix++) {
 

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GridTaskConnectRooms.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js"],"names":[],"mappings":"AAoBA;;;;;;;GAOG;AACH;IAuDI;;;;;;;OAOG;IACH;;;;;QAFa,oBAAoB,CAiBhC;IA1EG;;;OAGG;IACH,qBAAmB;IAEnB;;;OAGG;IACH,wBAAwC;IAExC;;;OAGG;IACH,yBAFU,MAAM,EAAE,CASjB;IAED;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAajB;IAED,kBAAkB;IAElB;;;OAGG;IACH,uBAAkB;IA4BtB;;;;;OAKG;IACH,sCAHW,OAAO,GACL,IAAI,CAqChB;IAED;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,6BAEN,MAAM,QA8DhB;IAED;;;;;;;OAOG;IACH,mCANW,OAAO,aACP,WAAW,6BAEX,MAAM,GACJ,OAAO,CAsFnB;IAED;;;;;;;;OAQG;IACH,gBAPW,MAAM,KACN,MAAM,aACN,MAAM,6BAEN,WAAW,aACX,MAAM,QAuEhB;IAED;;;;;;;OAOG;IACH,mCALW,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,GACN,SAAS,CA2BrB;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,0BAEN,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,QAWlB;IAED,iDAuEC;CACJ;kCA1fiC,4BAA4B;oBAT1C,kCAAkC;iBAErC,uCAAuC;uBALjC,mCAAmC;0BAShC,0DAA0D;sBAH9D,4CAA4C"}
+{"version":3,"file":"GridTaskConnectRooms.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/discrete/GridTaskConnectRooms.js"],"names":[],"mappings":"AAqBA;;;;;;;GAOG;AACH;IAuDI;;;;;;;OAOG;IACH;;;;;QAFa,oBAAoB,CAiBhC;IA1EG;;;OAGG;IACH,qBAAmB;IAEnB;;;OAGG;IACH,wBAAwC;IAExC;;;OAGG;IACH,yBAFU,MAAM,EAAE,CASjB;IAED;;;OAGG;IACH,uBAFU,MAAM,EAAE,CAajB;IAED,kBAAkB;IAElB;;;OAGG;IACH,uBAAkB;IA4BtB;;;;;OAKG;IACH,sCAHW,OAAO,GACL,IAAI,CAqChB;IAED;;;;;;OAMG;IACH,qBALW,MAAM,KACN,MAAM,6BAEN,MAAM,QA8DhB;IAED;;;;;;;OAOG;IACH,mCANW,OAAO,aACP,WAAW,6BAEX,MAAM,GACJ,OAAO,CAwFnB;IAED;;;;;;;;OAQG;IACH,gBAPW,MAAM,KACN,MAAM,aACN,MAAM,6BAEN,WAAW,aACX,MAAM,QAuEhB;IAED;;;;;;;OAOG;IACH,mCALW,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,GACN,SAAS,CAyBrB;IAED;;;;;;;OAOG;IACH,0BANW,MAAM,0BAEN,MAAM,EAAE,aACR,MAAM,aACN,MAAM,EAAE,QAWlB;IAED,iDAuEC;CACJ;kCA1fiC,4BAA4B;oBAT1C,kCAAkC;iBAErC,uCAAuC;uBANjC,mCAAmC;0BAUhC,0DAA0D;sBAH9D,4CAA4C"}

package/src/generation/grid/generation/discrete/GridTaskConnectRooms.js

@@ -2,6 +2,7 @@ import { matcher_tag_unoccupied } from "../../../../../samples/generation/rules/
 import { assert } from "../../../../core/assert.js";
 import { BitSet } from "../../../../core/binary/BitSet.js";
 import BinaryHeap from "../../../../core/collection/heap/FastBinaryHeap.js";
+import { Uint32Heap } from "../../../../core/collection/heap/Uint32Heap.js";
 import { passThrough } from "../../../../core/function/passThrough.js";
 import Vector2 from "../../../../core/geom/Vector2.js";
 import { min2 } from "../../../../core/math/min2.js";
@@ -237,7 +238,9 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
 
         distances.fill(65535);
 
-        const open = new BinaryHeap(i => distances[i]);
+        // const open = new BinaryHeap(i => distances[i]);
+
+        const open = new Uint32Heap();
 
         const closed = new BitSet();
 
@@ -291,7 +294,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
                 const isInOpen = open.contains(neighbour_index);
 
                 if (!isInOpen) {
-                    open.push(neighbour_index);
+                    open.insert(neighbour_index, 1);
 
                     distances[neighbour_index] = 1;
                 }
@@ -419,9 +422,7 @@ export class GridTaskConnectRooms extends GridTaskGenerator {
         for (let i = 0; i < gridSize; i++) {
             const distance = distances[i];
 
-            const v = min2(distance * 10, 255);
-
-            result.data[i * result.itemSize + 2] = v;
+            result.data[i * result.itemSize + 2] = min2(distance * 10, 255);
         }
 
         return result;

package/src/generation/grid/generation/util/buildDistanceMapToObjective.d.ts

@@ -1,7 +1,7 @@
 /**
  *
  * @param {Vector2} result
- * @param {BinaryHeap} open
+ * @param {Uint32Heap} open
  * @param {BitSet} closed
  * @param {number[]} distances
  * @param {GridData} grid

package/src/generation/grid/generation/util/buildDistanceMapToObjective.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildDistanceMapToObjective.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/util/buildDistanceMapToObjective.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,4IAFa,OAAO,CAmGnB"}
+{"version":3,"file":"buildDistanceMapToObjective.d.ts","sourceRoot":"","sources":["../../../../../../src/generation/grid/generation/util/buildDistanceMapToObjective.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;GAWG;AACH,4IAFa,OAAO,CA4FnB"}

package/src/generation/grid/generation/util/buildDistanceMapToObjective.js

@@ -3,7 +3,7 @@ import { assert } from "../../../../core/assert.js";
 /**
  *
  * @param {Vector2} result
- * @param {BinaryHeap} open
+ * @param {Uint32Heap} open
  * @param {BitSet} closed
  * @param {number[]} distances
  * @param {GridData} grid
@@ -42,9 +42,9 @@ export function buildDistanceMapToObjective(
 
     const neighbourhoodMaskSize = neighbourhoodMask.length;
 
-    while (open.size() > 0) {
+    while (!open.is_empty()) {
 
-        const current = open.pop();
+        const current = open.pop_min();
 
         closed.set(current, true);
 
@@ -84,18 +84,11 @@ export function buildDistanceMapToObjective(
 
             const distance = distances[current] + 1;
 
-            const isInOpen = open.contains(neighbour_index);
+            if (distance < distances[neighbour_index]) {
 
-            if (!isInOpen) {
-
-                open.push(neighbour_index);
                 distances[neighbour_index] = distance;
 
-            } else if (distance < distances[neighbour_index]) {
-
-                distances[neighbour_index] = distances;
-                open.updateElementScore(neighbour_index);
-
+                open.insert_or_update(neighbour_index, distance)
             }
 
             if (isMatch) {

package/src/core/math/makeNextOdd.d.ts

@@ -1,8 +0,0 @@
-/**
- *
- * even number of samples, make odd to ensure we sample reference point
- * @param {number} x
- * @return {number}
- */
-export function makeNextOdd(x: number): number;
-//# sourceMappingURL=makeNextOdd.d.ts.map

package/src/core/math/makeNextOdd.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"makeNextOdd.d.ts","sourceRoot":"","sources":["../../../../src/core/math/makeNextOdd.js"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,+BAHW,MAAM,GACL,MAAM,CAUjB"}

package/src/core/math/makeNextOdd.js

@@ -1,15 +0,0 @@
-/**
- *
- * even number of samples, make odd to ensure we sample reference point
- * @param {number} x
- * @return {number}
- */
-export function makeNextOdd(x) {
-    if (x % 2 === 0) {
-        // even, make odd
-        return x + 1;
-    }
-
-    // already odd
-    return x;
-}