refactor(geom-accel): dedupe into() impls

thi-ng · Sep 19, 2020 · 83b8cbd · 83b8cbd
1 parent 45156b2
commit 83b8cbd
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 18 deletions.
diff --git a/packages/geom-accel/src/aspatial-grid.ts b/packages/geom-accel/src/aspatial-grid.ts
@@ -11,6 +11,7 @@ import {
     subN,
     VecOpRoVV,
 } from "@thi.ng/vectors";
+import { into } from "./utils";
 
 /**
  * Common base class for {@link SpatialGrid2} and {@link SpatialGrid3}.
@@ -95,11 +96,7 @@ export abstract class ASpatialGrid<K extends ReadonlyVec, V>
     }
 
     into(pairs: Iterable<Pair<K, V>>, eps = EPS) {
-        let ok = true;
-        for (let [k, v] of pairs) {
-            ok = this.set(k, v, eps) && ok;
-        }
-        return ok;
+        return into(this, pairs, eps);
     }
 
     remove(k: K) {

diff --git a/packages/geom-accel/src/kd-tree-map.ts b/packages/geom-accel/src/kd-tree-map.ts
@@ -5,7 +5,7 @@ import { Heap } from "@thi.ng/heaps";
 import { EPS } from "@thi.ng/math";
 import { map } from "@thi.ng/transducers";
 import { distSq, ReadonlyVec, Vec } from "@thi.ng/vectors";
-import { addResults, CMP } from "./utils";
+import { addResults, CMP, into } from "./utils";
 
 type MaybeKdNode<K extends ReadonlyVec, V> = KdNode<K, V> | undefined;
 
@@ -139,11 +139,7 @@ export class KdTreeMap<K extends ReadonlyVec, V>
     }
 
     into(pairs: Iterable<Pair<K, V>>, eps = EPS) {
-        let ok = true;
-        for (let [k, v] of pairs) {
-            ok = this.set(k, v, eps) && ok;
-        }
-        return ok;
+        return into(this, pairs, eps);
     }
 
     remove(key: K) {

diff --git a/packages/geom-accel/src/nd-quadtree-map.ts b/packages/geom-accel/src/nd-quadtree-map.ts
@@ -15,7 +15,7 @@ import {
     submN,
     vop,
 } from "@thi.ng/vectors";
-import { addResults, CMP } from "./utils";
+import { addResults, CMP, into } from "./utils";
 
 export class NdQtNode<K extends ReadonlyVec, V> {
     pos: ReadonlyVec;
@@ -273,11 +273,7 @@ export class NdQuadtreeMap<K extends ReadonlyVec, V>
     }
 
     into(pairs: Iterable<Pair<K, V>>, eps = EPS) {
-        let ok = true;
-        for (let [k, v] of pairs) {
-            ok = this.set(k, v, eps) && ok;
-        }
-        return ok;
+        return into(this, pairs, eps);
     }
 
     remove(p: K) {

diff --git a/packages/geom-accel/src/utils.ts b/packages/geom-accel/src/utils.ts
@@ -1,4 +1,4 @@
-import type { Fn, Nullable } from "@thi.ng/api";
+import type { Fn, Fn3, Nullable, Pair } from "@thi.ng/api";
 
 /** @internal */
 export const CMP = (a: [number, any?], b: [number, any?]) => b[0] - a[0];
@@ -15,3 +15,24 @@ export const addResults = <A, B>(
     }
     return acc;
 };
+
+/**
+ * Shared `into()` impl for spatial map types.
+ *
+ * @param map
+ * @param pairs
+ * @param eps
+ *
+ * @internal
+ */
+export const into = <K, V>(
+    map: { set: Fn3<K, V, number, boolean> },
+    pairs: Iterable<Pair<K, V>>,
+    eps: number
+) => {
+    let ok = true;
+    for (let p of pairs) {
+        ok = map.set(p[0], p[1], eps) && ok;
+    }
+    return ok;
+};