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.

Sign up for GitHub

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

Jump to bottom

Update sort-subgraph.js #391

Closed
wants to merge 1 commit into from
Closed

Update sort-subgraph.js #391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions lib/order/sort-subgraph.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,40 @@
var barycenter = require("./barycenter");
var resolveConflicts = require("./resolve-conflicts");
var sort = require("./sort");
let barycenter = require("./barycenter");
let resolveConflicts = require("./resolve-conflicts");
let sort = require("./sort");

module.exports = sortSubgraph;

function sortSubgraph(g, v, cg, biasRight) {
var movable = g.children(v);
var node = g.node(v);
var bl = node ? node.borderLeft : undefined;
var br = node ? node.borderRight: undefined;
var subgraphs = {};
let movable = g.children(v);
let node = g.node(v);
let bl = node ? node.borderLeft : undefined;
let br = node ? node.borderRight: undefined;
let subgraphs = {};

if (bl) {
movable = movable.filter(w => w !== bl && w !== br);
}

var barycenters = barycenter(g, movable);
let barycenters = barycenter(g, movable);

Check failure on line 18 in lib/order/sort-subgraph.js

View workflow job for this annotation

GitHub Actions / build (ubuntu-latest, 18.x) 

Expected indentation of 2 spaces but found 3
barycenters.forEach(entry => {
if (g.children(entry.v).length) {
var subgraphResult = sortSubgraph(g, entry.v, cg, biasRight);
let subgraphResult = sortSubgraph(g, entry.v, cg, biasRight);
subgraphs[entry.v] = subgraphResult;
if (subgraphResult.hasOwnProperty("barycenter")) {
mergeBarycenters(entry, subgraphResult);
}
}
});

var entries = resolveConflicts(barycenters, cg);
let entries = resolveConflicts(barycenters, cg);
expandSubgraphs(entries, subgraphs);

var result = sort(entries, biasRight);
let result = sort(entries, biasRight);

if (bl) {
result.vs = [bl, result.vs, br].flat(true);
if (g.predecessors(bl).length) {
var blPred = g.node(g.predecessors(bl)[0]),
let blPred = g.node(g.predecessors(bl)[0]),
brPred = g.node(g.predecessors(br)[0]);
if (!result.hasOwnProperty("barycenter")) {
result.barycenter = 0;
Expand Down
Loading