Merge branch 'force-stop' of https://github.com/jasondavies/d3 into v…

…2.8.0
d3 · Feb 18, 2012 · 4345a0c · 4345a0c
2 parents 80e0e78 + 4f37a48
commit 4345a0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/d3.layout.js b/d3.layout.js
@@ -255,6 +255,9 @@ d3.layout.force = function() {
   }
 
   function tick() {
+    // simulated annealing, basically
+    if ((alpha *= .99) < .005) return true;
+
     var n = nodes.length,
         m = links.length,
         q,
@@ -319,9 +322,6 @@ d3.layout.force = function() {
     }
 
     event.tick({type: "tick", alpha: alpha});
-
-    // simulated annealing, basically
-    return (alpha *= .99) < .005;
   }
 
   force.nodes = function(x) {