Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for custom ranking function #292

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function updateInputGraph(inputGraph, layoutGraph) {
var graphNumAttrs = ["nodesep", "edgesep", "ranksep", "marginx", "marginy"];
var graphDefaults = { ranksep: 50, edgesep: 20, nodesep: 50, rankdir: "tb" };
var graphAttrs = ["acyclicer", "ranker", "rankdir", "align"];
var nodeNumAttrs = ["width", "height"];
var nodeNumAttrs = ["width", "height", "rank"];
var nodeDefaults = { width: 0, height: 0 };
var edgeNumAttrs = ["minlen", "weight", "width", "height", "labeloffset"];
var edgeDefaults = {
Expand Down
32 changes: 30 additions & 2 deletions lib/order/cross-count.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,40 @@ module.exports = crossCount;
*/
function crossCount(g, layering) {
var cc = 0;
for (var i = 1; i < layering.length; ++i) {
cc += twoLayerCrossCount(g, layering[i-1], layering[i]);
for (var i = 0; i < layering.length; ++i) {
cc += singleLayerCrossCount(g, layering[i]);
if (i > 0) {
cc += twoLayerCrossCount(g, layering[i-1], layering[i]);
}
}
return cc;
}


// Count crossings between a single layer, in cases where manual ranking
// enables edges between nodes with the same rank.
function singleLayerCrossCount(g, layer) {
var layerRank = g.node(layer[0]).rank;
var layerIndex = _.zipObject(
layer,
_.map(layer, function (v, i) { return i; })
);

var cc = 0;
_.forEach(layer, function(n, i) {
_.forEach(g.inEdges(n), function(e) {
if (g.node(e.v).rank == layerRank) {
var otherPos = layerIndex[e.v];
if (Math.abs(otherPos - i) > 1) {
cc++;
}
}
});
});
return cc;
}


function twoLayerCrossCount(g, northLayer, southLayer) {
// Sort all of the edges between the north and south layers by their position
// in the north layer and then the south. Map these edges to the position of
Expand Down
15 changes: 11 additions & 4 deletions lib/rank/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,21 @@ module.exports = rank;
* fix them up later.
*/
function rank(g) {
var ranker = g.graph().ranker;
if (ranker instanceof Function) {
return ranker(g)
}

switch(g.graph().ranker) {
case "network-simplex": networkSimplexRanker(g); break;
case "tight-tree": tightTreeRanker(g); break;
case "longest-path": longestPathRanker(g); break;
default: networkSimplexRanker(g);
case "network-simplex": networkSimplexRanker(g); break;
case "tight-tree": tightTreeRanker(g); break;
case "longest-path": longestPathRanker(g); break;
case "none": break;
default: networkSimplexRanker(g);
}
}


// A fast and simple ranker, but results are far from optimal.
var longestPathRanker = longestPath;

Expand Down