Merge pull request #9 from antvis/gaddi

Gaddi

Author: Yanyan-Wang

package.json

@@ -13,6 +13,9 @@
     "bootstrap": "lerna bootstrap",
     "ls": "lerna list"
   },
+  "dependencies": {
+    "@antv/util": "^2.0.9"
+  },
   "devDependencies": {
     "lerna": "^3.20.2"
   }

packages/graph/src/adjacent-matrix.ts

@@ -1,17 +1,17 @@
-import { GraphData, Matrix } from './types'
+import { GraphData, Matrix } from "./types";
 
 const adjMatrix = (graphData: GraphData, directed?: boolean) => {
-  const { nodes, edges } = graphData
+  const { nodes, edges } = graphData;
   const matrix: Matrix[] = [];
   // map node with index in data.nodes
   const nodeMap: {
     [key: string]: number;
   } = {};
 
   if (!nodes) {
-    throw new Error('invalid nodes data!');
+    throw new Error("invalid nodes data!");
   }
-  
+
   if (nodes) {
     nodes.forEach((node, i) => {
       nodeMap[node.id] = i;
@@ -25,6 +25,7 @@ const adjMatrix = (graphData: GraphData, directed?: boolean) => {
       const { source, target } = edge;
       const sIndex = nodeMap[source as string];
       const tIndex = nodeMap[target as string];
+      if ((!sIndex && sIndex !== 0) || (!tIndex && tIndex !== 0)) return;
       matrix[sIndex][tIndex] = 1;
       if (!directed) {
         matrix[tIndex][sIndex] = 1;

packages/graph/src/dijkstra.ts

@@ -1,5 +1,5 @@
-import { GraphData, NodeConfig, EdgeConfig } from './types';
-import { getOutEdgesNodeId, getEdgesByNodeId } from './util';
+import { GraphData, NodeConfig, EdgeConfig } from "./types";
+import { getOutEdgesNodeId, getEdgesByNodeId } from "./util";
 
 const minVertex = (
   D: { [key: string]: number },
@@ -50,7 +50,7 @@ const dijkstra = (
     if (directed) relatedEdges = getOutEdgesNodeId(minNodeId, edges);
     else relatedEdges = getEdgesByNodeId(minNodeId, edges);
 
-    relatedEdges.forEach(edge => {
+    relatedEdges.forEach((edge) => {
       const edgeTarget = edge.target;
       const edgeSource = edge.source;
       const w = edgeTarget === minNodeId ? edgeSource : edgeTarget;
@@ -86,20 +86,21 @@ const dijkstra = (
 
 export default dijkstra;
 
-function findAllPaths(source, target, prevs, findedPaths) {
+function findAllPaths(source, target, prevs, foundPaths) {
   if (source === target) {
     return [source];
   }
-  if (findedPaths[target]) {
-    return findedPaths[target];
+  if (foundPaths[target]) {
+    return foundPaths[target];
   }
   const paths = [];
   for (let prev of prevs[target]) {
-    const prevPaths = findAllPaths(source, prev, prevs, findedPaths);
+    const prevPaths = findAllPaths(source, prev, prevs, foundPaths);
+    if (!prevPaths) return;
     for (let prePath of prevPaths) {
       paths.push([...prePath, target]);
     }
   }
-  findedPaths[target] = paths;
+  foundPaths[target] = paths;
   return;
 }

packages/graph/src/floydWarshall.ts

@@ -1,8 +1,8 @@
-import getAdjMatrix from './adjacent-matrix';
-import { GraphData, Matrix } from './types';
+import getAdjMatrix from "./adjacent-matrix";
+import { GraphData, Matrix } from "./types";
 
 const floydWarshall = (graphData: GraphData, directed?: boolean) => {
-  const adjacentMatrix = getAdjMatrix(graphData, directed);;
+  const adjacentMatrix = getAdjMatrix(graphData, directed);
 
   const dist: Matrix[] = [];
   const size = adjacentMatrix.length;