Prep v0.6.4 release

dagrejs · Nov 2, 2014 · cf4d913 · cf4d913
1 parent ad2cf7a
commit cf4d913
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "dagre",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "main": [
     "dist/dagre.core.js",
     "dist/dagre.core.min.js"

diff --git a/dist/dagre.core.js b/dist/dagre.core.js
@@ -1997,6 +1997,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
   // We use local variables for these parameters instead of manipulating the
   // graph because it becomes more verbose to access them in a chained manner.
   var shift = {},
+      shiftNeighbor = {},
       sink = {},
       xs = {},
       pred = {},
@@ -2013,7 +2014,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
 
   _.each(g.nodes(), function(v) {
     if (root[v] === v) {
-      placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v);
+      placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, v);
     }
   });
 
@@ -2024,14 +2025,20 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
       // http://www.inf.uni-konstanz.de/~brandes/publications/ for details.
       if (v === root[v] && shift[sink[root[v]]] < Number.POSITIVE_INFINITY) {
         xs[v] += shift[sink[root[v]]];
+
+        // Cascade shifts as necessary
+        var w = shiftNeighbor[sink[root[v]]];
+        if (w && shift[w] !== Number.POSITIVE_INFINITY) {
+          xs[v] += shift[w];
+        }
       }
     });
   });
 
   return xs;
 }
 
-function placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v) {
+function placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, v) {
   if (_.has(xs, v)) return;
   xs[v] = 0;
 
@@ -2040,14 +2047,15 @@ function placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v) {
   do {
     if (pred[w]) {
       u = root[pred[w]];
-      placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, u);
+      placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, u);
       if (sink[v] === v) {
         sink[v] = sink[u];
       }
 
       var delta = sepFn(g, w, pred[w]);
       if (sink[v] !== sink[u]) {
         shift[sink[u]] = Math.min(shift[sink[u]], xs[v] - xs[u] - delta);
+        shiftNeighbor[sink[u]] = sink[v];
       } else {
         xs[v] = Math.max(xs[v], xs[u] + delta);
       }
@@ -2891,7 +2899,7 @@ function notime(name, fn) {
 }
 
 },{"./graphlib":7,"./lodash":10}],30:[function(require,module,exports){
-module.exports = "0.6.3";
+module.exports = "0.6.4";
 
 },{}]},{},[1])(1)
 });
diff --git a/dist/dagre.core.min.js b/dist/dagre.core.min.js
diff --git a/dist/dagre.js b/dist/dagre.js
@@ -1997,6 +1997,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
   // We use local variables for these parameters instead of manipulating the
   // graph because it becomes more verbose to access them in a chained manner.
   var shift = {},
+      shiftNeighbor = {},
       sink = {},
       xs = {},
       pred = {},
@@ -2013,7 +2014,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
 
   _.each(g.nodes(), function(v) {
     if (root[v] === v) {
-      placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v);
+      placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, v);
     }
   });
 
@@ -2024,14 +2025,20 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
       // http://www.inf.uni-konstanz.de/~brandes/publications/ for details.
       if (v === root[v] && shift[sink[root[v]]] < Number.POSITIVE_INFINITY) {
         xs[v] += shift[sink[root[v]]];
+
+        // Cascade shifts as necessary
+        var w = shiftNeighbor[sink[root[v]]];
+        if (w && shift[w] !== Number.POSITIVE_INFINITY) {
+          xs[v] += shift[w];
+        }
       }
     });
   });
 
   return xs;
 }
 
-function placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v) {
+function placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, v) {
   if (_.has(xs, v)) return;
   xs[v] = 0;
 
@@ -2040,14 +2047,15 @@ function placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, v) {
   do {
     if (pred[w]) {
       u = root[pred[w]];
-      placeBlock(g, layering, sepFn, root, align, shift, sink, pred, xs, u);
+      placeBlock(g, layering, sepFn, root, align, shift, shiftNeighbor, sink, pred, xs, u);
       if (sink[v] === v) {
         sink[v] = sink[u];
       }
 
       var delta = sepFn(g, w, pred[w]);
       if (sink[v] !== sink[u]) {
         shift[sink[u]] = Math.min(shift[sink[u]], xs[v] - xs[u] - delta);
+        shiftNeighbor[sink[u]] = sink[v];
       } else {
         xs[v] = Math.max(xs[v], xs[u] + delta);
       }
@@ -2891,7 +2899,7 @@ function notime(name, fn) {
 }
 
 },{"./graphlib":7,"./lodash":10}],30:[function(require,module,exports){
-module.exports = "0.6.3";
+module.exports = "0.6.4";
 
 },{}],31:[function(require,module,exports){
 /**

diff --git a/dist/dagre.min.js b/dist/dagre.min.js
diff --git a/lib/version.js b/lib/version.js
@@ -1 +1 @@
-module.exports = "0.6.4-pre";
+module.exports = "0.6.4";
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dagre",
-  "version": "0.6.4-pre",
+  "version": "0.6.4",
   "description": "Graph layout for JavaScript",
   "author": "Chris Pettitt <[email protected]>",
   "main": "index.js",
@@ -36,4 +36,4 @@
     "url": "https://github.com/cpettitt/dagre.git"
   },
   "license": "MIT"
-}
+}