@pascal-app/core 1.1.0 → 1.1.1

package/dist/spatial/usage-field/findings.js

@@ -202,15 +202,8 @@ function pocketIssue(nodes, room, from) {
         approximate,
     };
 }
-/**
- * The usage findings of a scene: narrow passages (measured from the chosen entrance, one for each
- * place that is narrow with the rooms it leads to, and the best other door as a fact), missing turning circles, floor a 0.60 m unit cannot get out of, wall
- * objects that stand out into circulation, pieces inside something solid, what stands in front of a
- * window or a door, a bed's room, a room's headroom and its ceiling. Every threshold is an indicator,
- * not a compliance check.
- */
-export function usageIssues(nodes, options = {}) {
-    const shapes = usageShapes(nodes);
+/** The passages, turning circles and pockets of every group of rooms, measured on one clearance field. */
+function circulationIssues(nodes, shapes, options) {
     const measure = measureUsage(nodes, shapes, options);
     const issues = [];
     for (const group of measure.groups) {
@@ -247,6 +240,45 @@ export function usageIssues(nodes, options = {}) {
             }
         }
     }
-    issues.push(...clashIssues(nodes, shapes), ...blockedOpeningIssues(nodes, shapes), ...doorSwingIssues(nodes, shapes), ...entryIssues(nodes, shapes), ...doorOverStairIssues(nodes, shapes), ...fixtureClearanceIssues(nodes, shapes), ...bedIssues(nodes, shapes));
     return issues;
 }
+/**
+ * Each measurement with the finding types it gives, in the order their findings are listed. On a
+ * building of a few hundred rooms the circulation measurement takes seconds and the others a
+ * fraction of one, so a question about some types takes the measurements that give them alone.
+ */
+const MEASUREMENTS = [
+    {
+        types: ['usage_pocket', 'usage_passage_narrow', 'usage_turning_narrow'],
+        run: circulationIssues,
+    },
+    { types: ['usage_clash'], run: clashIssues },
+    {
+        types: ['usage_opening_blocked'],
+        run: (nodes, shapes) => blockedOpeningIssues(nodes, shapes),
+    },
+    { types: ['usage_door_swing'], run: doorSwingIssues },
+    { types: ['usage_entry_narrow'], run: entryIssues },
+    { types: ['usage_door_over_stair'], run: doorOverStairIssues },
+    { types: ['usage_fixture_clearance'], run: fixtureClearanceIssues },
+    { types: ['usage_bed_clearance'], run: bedIssues },
+];
+/** Every finding type a measurement gives. */
+export const USAGE_TYPES = new Set(MEASUREMENTS.flatMap((measurement) => measurement.types));
+/**
+ * The usage findings of a scene: narrow passages (measured from the chosen entrance, one for each
+ * place that is narrow with the rooms it leads to, and the best other door as a fact), missing turning circles, floor a 0.60 m unit cannot get out of, wall
+ * objects that stand out into circulation, pieces inside something solid, what stands in front of a
+ * window or a door, a bed's room, a room's headroom and its ceiling. Every threshold is an indicator,
+ * not a compliance check.
+ */
+export function usageIssues(nodes, options = {}) {
+    const { types, ...measure } = options;
+    const asked = types
+        ? MEASUREMENTS.filter((measurement) => measurement.types.some((type) => types.has(type)))
+        : MEASUREMENTS;
+    if (asked.length === 0)
+        return [];
+    const shapes = usageShapes(nodes);
+    return asked.flatMap((measurement) => measurement.run(nodes, shapes, measure));
+}

package/dist/spatial/usage-field/path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/spatial/usage-field/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAwB,KAAK,IAAI,EAAE,MAAM,SAAS,CAAA;AA2D3E;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,CAAC,EAAE,IAAI,EACP,CAAC,EAAE,YAAY,EACf,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GACxB;IAAE,CAAC,EAAE,YAAY,CAAC;IAAC,CAAC,EAAE,UAAU,CAAA;CAAE,CAiCpC;AAED,qGAAqG;AACrG,wBAAgB,MAAM,CACpB,CAAC,EAAE,UAAU,EACb,CAAC,EAAE,YAAY,EACf,CAAC,EAAE,MAAM,GACR;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAOxC;AA8BD,qHAAqH;AACrH,wBAAgB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,YAAY,CAkCzF;AA8FD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAAA;AAE1E;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,CAAC,EAAE,IAAI,EACP,CAAC,EAAE,YAAY,EACf,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EACnC,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,EAC3C,EACE,CAAO,EACP,IAAY,EACZ,OAAa,EACb,KAAK,EACL,OAAY,GACb,GAAE;IAAE,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7F;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyC1D;AAaD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,CAAC,EAAE,IAAI,EACP,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,MAAM,EAAE,GAAG,IAAI,CAkCjB"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/spatial/usage-field/path.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,WAAW,EAAwB,KAAK,IAAI,EAAE,MAAM,SAAS,CAAA;AAqE3E;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,CAAC,EAAE,IAAI,EACP,CAAC,EAAE,YAAY,EACf,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GACxB;IAAE,CAAC,EAAE,YAAY,CAAC;IAAC,CAAC,EAAE,UAAU,CAAA;CAAE,CAiCpC;AAED,qGAAqG;AACrG,wBAAgB,MAAM,CACpB,CAAC,EAAE,UAAU,EACb,CAAC,EAAE,YAAY,EACf,CAAC,EAAE,MAAM,GACR;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAOxC;AA8BD,qHAAqH;AACrH,wBAAgB,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG,YAAY,CAmCzF;AA8FD,MAAM,MAAM,WAAW,GAAG,GAAG,CAAC,MAAM,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAC,CAAA;AAE1E;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,CAAC,EAAE,IAAI,EACP,CAAC,EAAE,YAAY,EACf,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,EACnC,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,EAC3C,EACE,CAAO,EACP,IAAY,EACZ,OAAa,EACb,KAAK,EACL,OAAY,GACb,GAAE;IAAE,CAAC,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7F;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAyC1D;AAaD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,CAAC,EAAE,IAAI,EACP,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,GACT,MAAM,EAAE,GAAG,IAAI,CAkCjB"}

package/dist/spatial/usage-field/path.js

@@ -1,8 +1,9 @@
 import { cellOf, cellX, cellZ } from './field.js';
-/** A binary min-heap on a numeric key. */
+/** A binary min-heap on a numeric key. `pop` returns the value and leaves its key in `key`. */
 class Heap {
     keys = [];
     values = [];
+    key = 0;
     get size() {
         return this.keys.length;
     }
@@ -14,37 +15,45 @@ class Heap {
         values.push(value);
         while (i > 0) {
             const parent = (i - 1) >> 1;
-            if (keys[i] >= keys[parent])
+            const above = keys[parent];
+            if (key >= above)
                 break;
-            [keys[i], keys[parent]] = [keys[parent], keys[i]];
-            [values[i], values[parent]] = [values[parent], values[i]];
+            keys[i] = above;
+            values[i] = values[parent];
             i = parent;
         }
+        keys[i] = key;
+        values[i] = value;
     }
     pop() {
         const keys = this.keys;
         const values = this.values;
-        const top = [keys[0], values[0]];
-        const lastKey = keys.pop();
-        const lastValue = values.pop();
-        if (keys.length) {
-            keys[0] = lastKey;
-            values[0] = lastValue;
+        this.key = keys[0];
+        const top = values[0];
+        const key = keys.pop();
+        const value = values.pop();
+        const size = keys.length;
+        if (size) {
             let i = 0;
             for (;;) {
                 const l = 2 * i + 1;
                 const r = l + 1;
                 let m = i;
-                if (l < keys.length && keys[l] < keys[m])
+                let least = key;
+                if (l < size && keys[l] < least) {
                     m = l;
-                if (r < keys.length && keys[r] < keys[m])
+                    least = keys[l];
+                }
+                if (r < size && keys[r] < least)
                     m = r;
                 if (m === i)
                     break;
-                [keys[i], keys[m]] = [keys[m], keys[i]];
-                [values[i], values[m]] = [values[m], values[i]];
+                keys[i] = keys[m];
+                values[i] = values[m];
                 i = m;
             }
+            keys[i] = key;
+            values[i] = value;
         }
         return top;
     }
@@ -72,11 +81,11 @@ export function widestPath(g, F, inside, sources) {
             heap.push(-F[s], s);
         }
     while (heap.size) {
-        const [negative, c] = heap.pop();
+        const c = heap.pop();
         if (done[c])
             continue;
         done[c] = 1;
-        const b = -negative;
+        const b = -heap.key;
         const i = c % g.W;
         const j = (c / g.W) | 0;
         for (const [di, dj] of FOUR) {
@@ -150,7 +159,8 @@ export function travel(g, pass, sources) {
             heap.push(0, s);
         }
     while (heap.size) {
-        const [d, c] = heap.pop();
+        const c = heap.pop();
+        const d = heap.key;
         if (d > D[c])
             continue;
         const i = c % g.W;
@@ -322,7 +332,7 @@ export function shortestRoute(g, pass, from, to) {
     cost[from] = 0;
     heap.push(heuristic(from), from);
     while (heap.size) {
-        const [, c] = heap.pop();
+        const c = heap.pop();
         if (c === to)
             break;
         const i = c % g.W;