Skip to content

Commit a73a309

Browse files
committed
support setTreeData on UndirectedGraph/WeightedUndirectedGraph
1 parent fda7061 commit a73a309

File tree

8 files changed

+34
-16
lines changed

8 files changed

+34
-16
lines changed

js/dom/setup/setup_document.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ const app = require('../../app');
22

33
module.exports = () => {
44
$(document).on('click', 'a', function (e) {
5-
console.log(e);
65
e.preventDefault();
76
if (!window.open($(this).attr('href'), '_blank')) {
87
alert('Please allow popups for this site');

js/module/tracer/directed_graph.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class DirectedGraphTracer extends Tracer {
7575
}
7676
}
7777

78-
setTreeData(G, root) {
78+
setTreeData(G, root, undirected) {
7979
var tracer = this;
8080

8181
root = root || 0;
@@ -92,7 +92,7 @@ class DirectedGraphTracer extends Tracer {
9292
};
9393
getDepth(root, 1);
9494

95-
if (this.setData(G)) return true;
95+
if (this.setData(G, undirected)) return true;
9696

9797
var place = function (node, x, y) {
9898
var temp = tracer.graph.nodes(tracer.n(node));
@@ -140,14 +140,15 @@ class DirectedGraphTracer extends Tracer {
140140

141141
if (undirected) {
142142
for (let j = 0; j <= i; j++) {
143-
if (G[i][j] || G[j][i]) {
143+
const value = G[i][j] || G[j][i];
144+
if (value) {
144145
edges.push({
145146
id: this.e(i, j),
146147
source: this.n(i),
147148
target: this.n(j),
148149
color: this.color.default,
149150
size: 1,
150-
weight: refineByType(G[i][j])
151+
weight: refineByType(value)
151152
});
152153
}
153154
}

js/module/tracer/undirected_graph.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ class UndirectedGraphTracer extends DirectedGraphTracer {
1111
if (this.isNew) initView(this);
1212
}
1313

14+
setTreeData(G, root) {
15+
return super.setTreeData(G, root, true);
16+
}
17+
1418
setData(G) {
1519
return super.setData(G, true);
1620
}

js/module/tracer/weighted_undirected_graph.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ class WeightedUndirectedGraphTracer extends WeightedDirectedGraphTracer {
1616
if (this.isNew) initView(this);
1717
}
1818

19+
setTreeData(G, root) {
20+
return super.setTreeData(G, root, true);
21+
}
22+
1923
setData(G) {
2024
return super.setData(G, true);
2125
}

public/algorithm_visualizer.js

Lines changed: 16 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/algorithm_visualizer.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/algorithm_visualizer.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/algorithm_visualizer.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)