Merge pull request #35 from antvis/0.1.11

fix: gaddi for only one node

Author: Yanyan-Wang

packages/graph/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/algorithm",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "description": "graph algorithm",
   "keywords": [
     "graph",

packages/graph/src/bfs.ts

@@ -43,6 +43,7 @@ const breadthFirstSearch = (
   graphData: GraphData,
   startNodeId: string,
   originalCallbacks?: IAlgorithmCallbacks,
+  directed: boolean = true
 ) => {
   const callbacks = initCallbacks(originalCallbacks);
   const nodeQueue = new Queue();
@@ -63,7 +64,7 @@ const breadthFirstSearch = (
     });
 
     // 将所有邻居添加到队列中以便遍历
-    getNeighbors(currentNode, edges, 'target').forEach((nextNode) => {
+    getNeighbors(currentNode, edges, directed ? 'target' : undefined).forEach((nextNode) => {
       if (
         callbacks.allowTraversal({
           previous: previousNode,

packages/graph/src/gaddi.ts

@@ -503,7 +503,11 @@ const GADDI = (
   );
 
   // 若未指定 length，自动计算 pattern 半径（最短路径最大值）
-  if (!length) length = Math.max(...patternSpm[0], 2);
+  let patternSpmSpread = [];
+  patternSpm?.forEach(row => {
+    patternSpmSpread = patternSpmSpread.concat(row);
+  })
+  if (!length) length = Math.max(...patternSpmSpread, 2);
   if (!k) k = length;
 
   // console.log("params", directed, length, k);
@@ -735,7 +739,7 @@ const GADDI = (
 
   // candidates 经过筛选后，以每个 candidate 为中心，生成 Length-neighbor 的邻居诱导子图
   // 并在诱导子图中去除不可能在 Q 上找到匹配的点：在 Q 上不存在的 label，其他 label 到 candidate 的最大最短距离符合 Q、NDS 距离符合 Q
-  candidates.forEach(candidate => {
+  candidates?.forEach(candidate => {
     const nodeIdx = nodeMap[candidate.id].idx;
     const lengthNeighborUnit = findKNeighborUnit(
       graphData.nodes,

packages/graph/src/types.ts

@@ -56,6 +56,7 @@ export interface IAlgorithm {
     graphData: GraphData,
     startNodeId: string,
     originalCallbacks?: IAlgorithmCallbacks,
+    directed?: boolean
   ) => void,
   connectedComponent: (graphData: GraphData, directed?: boolean) => NodeConfig[][],
   getDegree: (graphData: GraphData) => DegreeType,