Fixes #4: avoid getting stuck in endless loop when there are cycles i…

…n the graph
soxofaan · May 28, 2015 · 0edba18 · 0edba18
1 parent c553dde
commit 0edba18
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/examples/data/data06-with-cycle.js b/examples/data/data06-with-cycle.js
@@ -0,0 +1,26 @@
+sankeyDraw(
+  {
+    'nodes': [
+      {name: "a"},
+      {name: "b"},
+      {name: "c"},
+      {name: "d"},
+      {name: "e"},
+      {name: "f"},
+      {name: "g"}
+    ],
+    'links': [
+      {source: 0, target: 2, value: 10},
+      {source: 0, target: 3, value: 4},
+      {source: 1, target: 2, value: 9},
+      {source: 1, target: 3, value: 8},
+      {source: 2, target: 4, value: 2},
+      {source: 2, target: 5, value: 6},
+      {source: 2, target: 6, value: 7},
+      {source: 3, target: 4, value: 8},
+      {source: 3, target: 5, value: 4},
+      {source: 3, target: 6, value: 2},
+      {source: 5, target: 1, value: 2}
+    ]
+  }
+);
diff --git a/examples/example02.html b/examples/example02.html
@@ -142,7 +142,8 @@
     'data/data02.js',
     'data/data03.js',
     'data/data04.js',
-    'data/data05.js'
+    'data/data05.js',
+    'data/data06-with-cycle.js'
   ];
 
   // Try to get initial data set from url fragment.

diff --git a/sankey.js b/sankey.js
@@ -123,7 +123,7 @@ d3.sankey = function() {
 
     // Work from left to right.
     // Keep updating the breath (x-position) of nodes that are target of recently updated nodes.
-    while (remainingNodes.length) {
+    while (remainingNodes.length && x < nodes.length) {
       nextNodes = [];
       remainingNodes.forEach(function(node) {
         node.x = x;