Remove options parameter in tracer constructors

Author: 64json

src/backend/public/algorithms

@@ -1,17 +1,9 @@
 class Data {
-  constructor(options) {
-    this.options = {
-      ...this.getDefaultOptions(),
-      ...options,
-    };
+  constructor() {
     this.init();
     this.reset();
   }
 
-  getDefaultOptions() {
-    return {};
-  }
-
   init() {
   }
 

src/backend/tracers

@@ -3,14 +3,6 @@ import { distance } from '/common/util';
 import { tracerManager } from '/core';
 
 class GraphData extends Data {
-  getDefaultOptions() {
-    return {
-      ...super.getDefaultOptions(),
-      directed: true,
-      weighted: false,
-    };
-  }
-
   init() {
     super.init();
     this.dimensions = {
@@ -22,20 +14,29 @@ class GraphData extends Data {
       nodeWeightGap: 4,
       edgeWeightGap: 4,
     };
-    this.logData = null;
+    this.isDirected = true;
+    this.isWeighted = false;
     this.callLayout = { method: this.layoutCircle, args: [] };
+    this.logData = null;
+  }
+
+  directed(isDirected = true) {
+    this.isDirected = isDirected;
+  }
+
+  weighted(isWeighted = true) {
+    this.isWeighted = isWeighted;
   }
 
   set(array2d = []) {
-    const { weighted } = this.options;
     this.nodes = [];
     this.edges = [];
     for (let i = 0; i < array2d.length; i++) {
       this.addNode(i);
       for (let j = 0; j < array2d.length; j++) {
         const value = array2d[i][j];
         if (value) {
-          this.addEdge(i, j, weighted ? value : null);
+          this.addEdge(i, j, this.isWeighted ? value : null);
         }
       }
     }
@@ -64,8 +65,8 @@ class GraphData extends Data {
     return this.nodes.find(node => node.id === id);
   }
 
-  findEdge(source, target, directed = this.options.directed) {
-    if (directed) {
+  findEdge(source, target, isDirected = this.isDirected) {
+    if (isDirected) {
       return this.edges.find(edge => edge.source === source && edge.target === target);
     } else {
       return this.edges.find(edge =>
@@ -74,21 +75,21 @@ class GraphData extends Data {
     }
   }
 
-  findLinkedEdges(source, directed = this.options.directed) {
-    if (directed) {
+  findLinkedEdges(source, isDirected = this.isDirected) {
+    if (isDirected) {
       return this.edges.filter(edge => edge.source === source);
     } else {
       return this.edges.filter(edge => edge.source === source || edge.target === source);
     }
   }
 
-  findLinkedNodeIds(source, directed = this.options.directed) {
-    const edges = this.findLinkedEdges(source, directed);
+  findLinkedNodeIds(source, isDirected = this.isDirected) {
+    const edges = this.findLinkedEdges(source, isDirected);
     return edges.map(edge => edge.source === source ? edge.target : edge.source);
   }
 
-  findLinkedNodes(source, directed = this.options.directed) {
-    const ids = this.findLinkedNodeIds(source, directed);
+  findLinkedNodes(source, isDirected = this.isDirected) {
+    const ids = this.findLinkedNodeIds(source, isDirected);
     return ids.map(id => this.findNode(id));
   }
 

src/frontend/core/datas/Data.js

@@ -39,9 +39,8 @@ class GraphRenderer extends Renderer {
   }
 
   renderData() {
-    const { nodes, edges, options, dimensions } = this.props.data;
+    const { nodes, edges, isDirected, isWeighted, dimensions } = this.props.data;
     const { baseWidth, baseHeight, nodeRadius, arrowGap, nodeWeightGap, edgeWeightGap } = dimensions;
-    const { directed, weighted } = options;
     const viewBox = [
       (this.centerX - baseWidth / 2) * this.zoom,
       (this.centerY - baseHeight / 2) * this.zoom,
@@ -71,7 +70,7 @@ class GraphRenderer extends Renderer {
             const dx = ex - sx;
             const dy = ey - sy;
             const degree = Math.atan2(dy, dx) / Math.PI * 180;
-            if (directed) {
+            if (isDirected) {
               const length = Math.sqrt(dx * dx + dy * dy);
               if (length !== 0) {
                 ex = sx + dx / length * (length - nodeRadius - arrowGap);
@@ -81,9 +80,9 @@ class GraphRenderer extends Renderer {
 
             return (
               <g className={classes(styles.edge, selectedCount && styles.selected, visitedCount && styles.visited)} key={`${source}-${target}`}>
-                <path d={`M${sx},${sy} L${ex},${ey}`} className={classes(styles.line, directed && styles.directed)} />
+                <path d={`M${sx},${sy} L${ex},${ey}`} className={classes(styles.line, isDirected && styles.directed)} />
                 {
-                  weighted &&
+                  isWeighted &&
                   <g transform={`translate(${mx},${my})`}>
                     <text className={styles.weight} transform={`rotate(${degree})`}
                           y={-edgeWeightGap}>{this.toString(weight)}</text>
@@ -102,7 +101,7 @@ class GraphRenderer extends Renderer {
                 <circle className={styles.circle} r={nodeRadius} />
                 <text className={styles.id}>{id}</text>
                 {
-                  weighted &&
+                  isWeighted &&
                   <text className={styles.weight} x={nodeRadius + nodeWeightGap}>{this.toString(weight)}</text>
                 }
               </g>

src/frontend/core/datas/GraphData.js

@@ -12,7 +12,6 @@ class TracerManager {
     this.started = false;
     this.lineIndicator = null;
     this.file = { name: '', content: '', contributors: [] };
-    this.jsWorker = null;
     this.reset();
   }
 
@@ -84,7 +83,7 @@ class TracerManager {
     if (this.onChangeRenderers) this.onChangeRenderers(this.renderers);
   }
 
-  addTracer(className, tracerKey, title, options) {
+  addTracer(className, tracerKey, title) {
     const [DataClass, RendererClass] = {
       Tracer: [Data, Renderer],
       LogTracer: [LogData, LogRenderer],
@@ -93,7 +92,7 @@ class TracerManager {
       ChartTracer: [ChartData, ChartRenderer],
       GraphTracer: [GraphData, GraphRenderer],
     }[className];
-    const data = new DataClass(options);
+    const data = new DataClass();
     this.datas[tracerKey] = data;
     const renderer = (
       <RendererClass key={tracerKey} title={title} data={data} wsProps={{ fixed: true }} />
@@ -108,8 +107,8 @@ class TracerManager {
     const { tracerKey, method, args } = trace;
     try {
       if (method === 'construct') {
-        const [className, title, options] = args;
-        this.addTracer(className, tracerKey, title, options);
+        const [className, title] = args;
+        this.addTracer(className, tracerKey, title);
         return true;
       } else {
         const data = this.datas[tracerKey];