Merge pull request #24 from antvis/cpu-usage

Cpu usage

Author: Yanyan-Wang

CHANGELOG.md

@@ -1,4 +1,9 @@
 # ChangeLog
+#### 0.1.8
+
+- fix: CPU usage increases due to 0.1.3-beta ~ 0.1.3 with publicPath configuration;
+- fix: CPU usage increases due to 0.1.6 ~ 0.17 with browser output;
+- feat: export fix: export detectAllCycles, detectAllDirectedCycle, detectAllUndirectedCycle;
 
 #### 0.1.6
 
@@ -8,6 +13,7 @@
 
 - fix: worker async problem;
 - chore: unify allPath and allPaths;
+
 #### 0.1.2
 
 - fix: failed to find result problem in dijkstra;

packages/graph/package.json

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

packages/graph/src/index.ts

@@ -3,7 +3,7 @@ import breadthFirstSearch from './bfs';
 import connectedComponent from './connected-component';
 import getDegree from './degree';
 import { getInDegree, getOutDegree } from './degree';
-import detectCycle from './detect-cycle';
+import detectCycle, { detectAllCycles, detectAllDirectedCycle, detectAllUndirectedCycle } from './detect-cycle';
 import depthFirstSearch from './dfs';
 import dijkstra from './dijkstra';
 import { findAllPath, findShortestPath } from './find-path';
@@ -16,13 +16,19 @@ import GADDI from './gaddi';
 import Stack from './structs/stack';
 import { getNeighbors } from './util';
 
+const detectDirectedCycle = detectCycle;
+const detectDirectedCycleAsync = detectCycleAsync;
+
 import {
   getAdjMatrixAsync,
   connectedComponentAsync,
   getDegreeAsync,
   getInDegreeAsync,
   getOutDegreeAsync,
   detectCycleAsync,
+  detectAllCyclesAsync,
+  detectAllDirectedCycleAsync,
+  detectAllUndirectedCycleAsync,
   dijkstraAsync,
   findAllPathAsync,
   findShortestPathAsync,
@@ -43,6 +49,10 @@ export {
   getInDegree,
   getOutDegree,
   detectCycle,
+  detectDirectedCycle,
+  detectAllCycles,
+  detectAllDirectedCycle,
+  detectAllUndirectedCycle,
   depthFirstSearch,
   dijkstra,
   findAllPath,
@@ -61,6 +71,10 @@ export {
   getInDegreeAsync,
   getOutDegreeAsync,
   detectCycleAsync,
+  detectDirectedCycleAsync,
+  detectAllCyclesAsync,
+  detectAllDirectedCycleAsync,
+  detectAllUndirectedCycleAsync,
   dijkstraAsync,
   findAllPathAsync,
   findShortestPathAsync,
@@ -81,6 +95,10 @@ export default {
   getInDegree,
   getOutDegree,
   detectCycle,
+  detectDirectedCycle,
+  detectAllCycles,
+  detectAllDirectedCycle,
+  detectAllUndirectedCycle,
   depthFirstSearch,
   dijkstra,
   findAllPath,
@@ -99,6 +117,10 @@ export default {
   getInDegreeAsync,
   getOutDegreeAsync,
   detectCycleAsync,
+  detectDirectedCycleAsync,
+  detectAllCyclesAsync,
+  detectAllDirectedCycleAsync,
+  detectAllUndirectedCycleAsync,
   dijkstraAsync,
   findAllPathAsync,
   findShortestPathAsync,

packages/graph/src/workers/constant.ts

@@ -4,6 +4,10 @@ export const ALGORITHM = {
   connectedComponent: 'connectedComponent',
   depthFirstSearch: 'depthFirstSearch',
   detectCycle: 'detectCycle',
+  detectDirectedCycle: 'detectDirectedCycle',
+  detectAllCycles: 'detectAllCycles',
+  detectAllDirectedCycle: 'detectAllDirectedCycle',
+  detectAllUndirectedCycle: 'detectAllUndirectedCycle',
   dijkstra: 'dijkstra',
   findAllPath: 'findAllPath',
   findShortestPath: 'findShortestPath',

packages/graph/src/workers/createWorker.ts

@@ -14,13 +14,13 @@ const createWorker = <R>(type: string) => (...data) =>
   new Promise<R>((resolve, reject) => {
       const worker = new Worker();
       worker.postMessage({
-        type,
+          _algorithmType:type,
         data,
       });
 
       worker.onmessage = (event: Event) => {
-        const { data, type } = event.data;
-        if (MESSAGE.SUCCESS === type) {
+        const { data, _algorithmType } = event.data;
+        if (MESSAGE.SUCCESS === _algorithmType) {
           resolve(data);
         } else {
           reject();

packages/graph/src/workers/index.ts

@@ -2,7 +2,6 @@ import {
   GraphData,
   DegreeType,
   Matrix,
-  IAlgorithmCallbacks,
   ClusterData,
   EdgeConfig,
   NodeConfig,
@@ -49,14 +48,41 @@ const getOutDegreeAsync = (graphData: GraphData, nodeId: string) =>
   createWorker<DegreeType>(ALGORITHM.getOutDegree)(graphData, nodeId);
 
 /**
- * 检测图中的 Cycle
+ * 检测图中的(有向) Cycle
  * @param graphData 图数据
  */
 const detectCycleAsync = (graphData: GraphData) =>
   createWorker<{
     [key: string]: string;
   }>(ALGORITHM.detectCycle)(graphData);
 
+/**
+ * 检测图中的(无向) Cycle
+ * @param graphData 图数据
+ */
+ const detectAllCyclesAsync = (graphData: GraphData) =>
+ createWorker<{
+   [key: string]: string;
+ }>(ALGORITHM.detectAllCycles)(graphData);
+
+/**
+ * 检测图中的所有(有向) Cycle
+ * @param graphData 图数据
+ */
+ const detectAllDirectedCycleAsync = (graphData: GraphData) =>
+ createWorker<{
+   [key: string]: string;
+ }>(ALGORITHM.detectAllDirectedCycle)(graphData);
+
+/**
+ * 检测图中的所有(无向) Cycle
+ * @param graphData 图数据
+ */
+ const detectAllUndirectedCycleAsync = (graphData: GraphData) =>
+ createWorker<{
+   [key: string]: string;
+ }>(ALGORITHM.detectAllUndirectedCycle)(graphData);
+
 /**
  * Dijkstra's algorithm, See {@link https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm}
  * @param graphData 图数据
@@ -211,6 +237,9 @@ export {
   getInDegreeAsync,
   getOutDegreeAsync,
   detectCycleAsync,
+  detectAllCyclesAsync,
+  detectAllDirectedCycleAsync,
+  detectAllUndirectedCycleAsync,
   dijkstraAsync,
   findAllPathAsync,
   findShortestPathAsync,

packages/graph/src/workers/index.worker.ts

@@ -9,14 +9,18 @@ interface Event {
 }
 
 ctx.onmessage = (event: Event) => {
-  const { type, data } = event.data;
-  if (typeof algorithm[type] === 'function') {
-    const result = algorithm[type](...data);
-    ctx.postMessage({ type: MESSAGE.SUCCESS, data: result });
+  const { _algorithmType, data } = event.data;
+  // 如果发送内容没有私有类型。说明不是自己发的。不管
+  // fix: https://github.com/antvis/algorithm/issues/25
+  if(!_algorithmType){
     return;
   }
-
-  ctx.postMessage({ type: MESSAGE.FAILURE });
+  if (typeof algorithm[_algorithmType] === 'function') {
+    const result = algorithm[_algorithmType](...data);
+    ctx.postMessage({ _algorithmType: MESSAGE.SUCCESS, data: result });
+    return;
+  }
+  ctx.postMessage({ _algorithmType: MESSAGE.FAILURE });
 };
 
 // https://stackoverflow.com/questions/50210416/webpack-worker-loader-fails-to-compile-typescript-worker

packages/graph/webpack.config.js

@@ -14,6 +14,9 @@ module.exports = {
     globalObject: 'this',
     publicPath: './dist',
   },
+  watchOptions: {
+    ignored: /node_modules/
+  },
   resolve: {
     extensions: ['.ts', '.js'],
   },

packages/graph/webpack.dev.config.js

@@ -7,6 +7,7 @@ module.exports = Object.assign(
     watchOptions: {
       aggregateTimeout: 300,
       poll: 1000,
+      ignored: /node_modules/
     },
   },
   webpackConfig,