refactor(distance): use clamp0()

thi-ng · Jan 24, 2021 · 8987946 · 8987946
1 parent d18c869
commit 8987946
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/packages/distance/package.json b/packages/distance/package.json
@@ -51,6 +51,7 @@
     "dependencies": {
         "@thi.ng/api": "^6.13.6",
         "@thi.ng/heaps": "^1.2.31",
+        "@thi.ng/math": "^3.1.0",
         "@thi.ng/vectors": "^4.9.1"
     },
     "files": [

diff --git a/packages/distance/src/knearest.ts b/packages/distance/src/knearest.ts
@@ -1,5 +1,6 @@
 import type { IDeref } from "@thi.ng/api";
 import { Heap } from "@thi.ng/heaps";
+import { clamp0 } from "@thi.ng/math";
 import type { ReadonlyVec } from "@thi.ng/vectors";
 import type { IDistance, INeighborhood, Neighbor } from "./api";
 import { DIST_SQ, DIST_SQ1, DIST_SQ2, DIST_SQ3 } from "./squared";
@@ -31,7 +32,7 @@ export class KNearest<D, T>
         radius = Infinity,
         public sorted = false
     ) {
-        this.radius = Math.max(0, radius);
+        this.radius = clamp0(radius);
         this.reset();
     }
 

diff --git a/packages/distance/src/nearest.ts b/packages/distance/src/nearest.ts
@@ -1,6 +1,7 @@
 import type { IDeref } from "@thi.ng/api";
+import { clamp0 } from "@thi.ng/math";
 import type { ReadonlyVec } from "@thi.ng/vectors";
-import type { IDistance, Neighbor, INeighborhood } from "./api";
+import type { IDistance, INeighborhood, Neighbor } from "./api";
 import { DIST_SQ, DIST_SQ1, DIST_SQ2, DIST_SQ3 } from "./squared";
 
 /**
@@ -19,7 +20,7 @@ export class Nearest<D, T>
         public readonly target: D,
         radius = Infinity
     ) {
-        this.radius = Math.max(0, radius);
+        this.radius = clamp0(radius);
         this.reset();
     }