@thi.ng/adjacency 2.3.36 → 2.4.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2023-08-27T11:20:58Z
+- **Last updated**: 2023-10-19T08:38:06Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,15 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+## [2.4.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/adjacency@2.4.0) (2023-10-18)
+
+#### 🚀 Features
+
+- add AdjacencyBitMatrix.similarity(), other updates ([259b507](https://github.com/thi-ng/umbrella/commit/259b507))
+  - add AdjacencyBitMatrix.similarity() to select related nodes (based on shared connections)
+  - simplify AdjacencyBitMatrix.neighbors()
+  - fix iteration bug in AdjacencyBitMatrix.edges()
+
 ## [2.3.0](https://github.com/thi-ng/umbrella/tree/@thi.ng/adjacency@2.3.0) (2022-12-22)
 
 #### 🚀 Features

package/README.md

@@ -73,7 +73,7 @@ For Node.js REPL:
 const adjacency = await import("@thi.ng/adjacency");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 2.55 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 2.57 KB
 
 ## Dependencies
 
@@ -104,14 +104,15 @@ TODO
 
 ## Authors
 
-- [Karsten Schmidt](https://thi.ng)
+- [Karsten Schmidt](https://thi.ng) (Main author)
+- [Igor Loskutov](https://github.com/Firfi)
 
 If this project contributes to an academic publication, please cite it as:
 
 ```bibtex
 @misc{thing-adjacency,
   title = "@thi.ng/adjacency",
-  author = "Karsten Schmidt",
+  author = "Karsten Schmidt and others",
   note = "https://thi.ng/adjacency",
   year = 2018
 }

package/api.d.ts

@@ -38,6 +38,12 @@ export interface IGraph<T = number> {
      * @param to -
      */
     hasEdge(from: T, to: T): boolean;
+    /**
+     * Returns true if a vertex exists for the given id.
+     *
+     * @param id -
+     */
+    hasVertex(id: T): boolean;
     /**
      * Returns number of edges for given vertex. By default only outgoing edges
      * are counted, but can be customized via given {@link DegreeType}. Note: In

package/binary.d.ts

@@ -23,8 +23,10 @@ export declare class AdjacencyBitMatrix implements IGraph<number> {
     addEdge(from: number, to: number): boolean;
     removeEdge(from: number, to: number): boolean;
     hasEdge(from: number, to: number): boolean;
+    hasVertex(id: number): boolean;
     degree(id: number, type?: DegreeType): number;
     neighbors(id: number): number[];
+    similarity(id: number, threshold?: number): number[][];
     invert(): AdjacencyBitMatrix;
     toString(): string;
     toDot(ids?: string[]): string;

package/binary.js

@@ -15,7 +15,7 @@ export class AdjacencyBitMatrix {
     }
     *edges() {
         const directed = !this.undirected;
-        for (let i = this.mat.n; i-- > 0;) {
+        for (let i = this.mat.m; i-- > 0;) {
             for (let n of this.neighbors(i)) {
                 if (directed || n > i) {
                     yield [i, n];
@@ -57,6 +57,9 @@ export class AdjacencyBitMatrix {
     hasEdge(from, to) {
         return this.mat.at(from, to) !== 0;
     }
+    hasVertex(id) {
+        return (this.mat.popCountRow(id) !== 0 || this.mat.popCountColumn(id) !== 0);
+    }
     degree(id, type = "out") {
         let degree = 0;
         if (this.undirected || type !== "in")
@@ -66,18 +69,20 @@ export class AdjacencyBitMatrix {
         return degree;
     }
     neighbors(id) {
-        const res = [];
-        const { data, stride } = this.mat;
-        id *= stride;
-        for (let i = this.mat.n - 1, j = id + stride - 1; i >= 0; i -= 8, j--) {
-            const v = data[j];
-            if (v !== 0) {
-                for (let k = 31 - Math.clz32(v); k >= 0; k--) {
-                    (v & (1 << k)) !== 0 && res.push(i - k);
-                }
-            }
+        return [...this.mat.row(id, true).positions()];
+    }
+    similarity(id, threshold = 0) {
+        const mat = this.mat;
+        const query = mat.row(id, true);
+        const acc = [];
+        for (let i = 0, m = mat.m; i < m; i++) {
+            if (i === id)
+                continue;
+            const sim = query.similarity(mat.row(i, true));
+            if (sim >= threshold)
+                acc.push([i, sim]);
         }
-        return res;
+        return acc.sort((a, b) => b[1] - a[1]);
     }
     invert() {
         return __invert(new AdjacencyBitMatrix(this.mat.n, undefined, this.undirected), this.edges());

package/list.d.ts

@@ -12,6 +12,7 @@ export declare class AdjacencyList implements IGraph<number> {
     edges(): Generator<Edge, void, unknown>;
     addVertex(id: number): void;
     removeVertex(id: number): boolean;
+    hasVertex(id: number): boolean;
     addEdge(from: number, to: number): boolean;
     removeEdge(from: number, to: number): boolean;
     hasEdge(from: number, to: number): boolean;

package/list.js

@@ -55,6 +55,9 @@ export class AdjacencyList {
         this.numV--;
         return true;
     }
+    hasVertex(id) {
+        return !!this.adjacency[id];
+    }
     addEdge(from, to) {
         const vertex = this.ensureVertexData(from);
         this.ensureVertexData(to);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/adjacency",
-  "version": "2.3.36",
+  "version": "2.4.1",
   "description": "Sparse & bitwise adjacency matrices, lists and selected traversal algorithms for directed & undirected graphs",
   "type": "module",
   "module": "./index.js",
@@ -22,6 +22,9 @@
     }
   ],
   "author": "Karsten Schmidt (https://thi.ng)",
+  "contributors": [
+    "Igor Loskutov (https://github.com/Firfi)"
+  ],
   "license": "Apache-2.0",
   "scripts": {
     "build": "yarn clean && tsc --declaration",
@@ -35,16 +38,16 @@
   },
   "dependencies": {
     "@thi.ng/api": "^8.9.5",
-    "@thi.ng/arrays": "^2.6.2",
-    "@thi.ng/bitfield": "^2.2.38",
-    "@thi.ng/dcons": "^3.2.63",
+    "@thi.ng/arrays": "^2.6.3",
+    "@thi.ng/bitfield": "^2.3.0",
+    "@thi.ng/dcons": "^3.2.64",
     "@thi.ng/errors": "^2.3.5",
-    "@thi.ng/sparse": "^0.3.68"
+    "@thi.ng/sparse": "^0.3.69"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.36.4",
     "@thi.ng/testament": "^0.3.23",
-    "@thi.ng/vectors": "^7.7.18",
+    "@thi.ng/vectors": "^7.7.19",
     "rimraf": "^5.0.1",
     "tools": "^0.0.1",
     "typedoc": "^0.25.0",
@@ -122,5 +125,5 @@
     ],
     "year": 2018
   },
-  "gitHead": "d492ecb41df758db372a76449ea9b5bad47b25c4\n"
+  "gitHead": "ae301a8a5f13f518dec04a975479c6e779a8ca9e\n"
 }

package/sparse.d.ts

@@ -7,6 +7,7 @@ export declare class AdjacencyMatrix extends CSR implements IGraph<number> {
     addEdge(from: number, to: number): boolean;
     removeEdge(from: number, to: number): boolean;
     hasEdge(from: number, to: number): boolean;
+    hasVertex(id: number): boolean;
     numEdges(): number;
     numVertices(): number;
     degree(id: number, type?: DegreeType): number;

package/sparse.js

@@ -38,6 +38,9 @@ export class AdjacencyMatrix extends CSR {
     hasEdge(from, to) {
         return this.at(from, to) !== 0;
     }
+    hasVertex(id) {
+        return this.degree(id, "inout") > 0;
+    }
     numEdges() {
         const n = this.data.length;
         return this.undirected ? n / 2 : n;