misc/architype
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify affinity, strengthen links

Browse Source
This commit is contained in:
Ian Gulliver
2019-07-16 05:28:02 +00:00
parent 5aeee2e8ea
commit 388813d094
3 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
LayoutNode.js
View File

@@ -35,49 +35,35 @@ class LayoutNode {
// Keep unassociated subgroups together
this.addAffinity(node, d => d);
// Keep one space between subgraphs
if (this.subgraph != node.subgraph && this.label != node.label) {
this.addAffinity(node, d => d <= 2 ? -INF : 0);
}
// Am I in any labeled groups that node is not?
// If so, preserve two spaces above the group
if (asymDifference(this.labelGroups(this.groups), node.groups).size) {
this.addAffinity(node,
(d, v) =>
(v[0] >= -1 && v[0] <= 1 && v[1] < 0 && v[1] >= -2) ? -INF : 0);
}
// Preserve one space all around the group
if (asymDifference(this.graphGroups(this.groups),
this.graphGroups(node.groups)).size) {
this.addAffinity(node, d => d <= 2 ? -INF : 0);
}
// Try to stack nodes with the same label
if (node.label == this.label) {
this.addAffinity(node, (d, v) => v[0] == 0 ? 200 : 500);
}
for (let group of this.groups) {
// Ensure groups do not overlap
if (!group.isType('group') && !group.isType('subgraph')) {
continue;
}
// Ensure groups do not overlap, with border
if (group.nodes.has(node)) {
continue;
}
this.addAffinity(node, (d, v, p) => group.isContained(p) ? -INF : 0);
this.addAffinity(node,
(d, v, p) => group.isContainedWithMargin(p) ? -INF : 0);
}
}
for (let link of this.links) {
// Stronger affinity for links
// Prefer to move toward the target instance
this.addAffinity(link.to, d => d <= 2 ? -INF : d * 11);
link.to.addAffinity(this, d => d <= 2 ? -INF : d * 9);
this.addAffinity(link.to, d => d <= 2 ? -INF : d * 40);
link.to.addAffinity(this, d => d <= 2 ? -INF : d * 35);
}
// Affinity for groups
// Affinity within groups
for (let group of this.groups) {
if (!group.hasGraphGroup()) {
if (!group.isType('group')) {
continue;
}
for (let node of group.nodes) {
@@ -86,14 +72,6 @@ class LayoutNode {
}
}
graphGroups(groups) {
return new Set(Array.from(groups).filter(g => g.hasGraphGroup()));
}
labelGroups(groups) {
return new Set(Array.from(groups).filter(g => !!g.label));
}
addAffinity(node, distanceToWeight) {
if (this == node) {
return;