Skip to content

Commit

Permalink
Dont relayout for new unconnected nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
@davkal
davkal committed Nov 7, 2016
1 parent b0a410d commit 073a5d9
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 38 deletions.
56 changes: 30 additions & 26 deletions client/app/scripts/charts/__tests__/node-layout-test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,9 @@ describe('NodesLayout', () => {
it('renders single nodes next to portrait graph', () => {
const result = NodesLayout.doLayout(
nodeSets.singlePortrait.nodes,
nodeSets.singlePortrait.edges);
nodeSets.singlePortrait.edges,
{ noCache: true }
);

nodes = result.nodes.toJS();

Expand All @@ -314,7 +316,9 @@ describe('NodesLayout', () => {
it('renders an additional single node in single nodes group', () => {
let result = NodesLayout.doLayout(
nodeSets.singlePortrait.nodes,
nodeSets.singlePortrait.edges);
nodeSets.singlePortrait.edges,
{ noCache: true }
);

nodes = result.nodes.toJS();

Expand Down Expand Up @@ -347,28 +351,28 @@ describe('NodesLayout', () => {
expect(nodes.n1.x).toBeLessThan(nodes.n5.x);
expect(nodes.n1.x).toBeLessThan(nodes.n6.x);
});

it('adds a new node to existing layout in a line', () => {
let result = NodesLayout.doLayout(
nodeSets.initial4.nodes,
nodeSets.initial4.edges);

nodes = result.nodes.toJS();

coords = getNodeCoordinates(result.nodes);
options.cachedLayout = result;
options.nodeCache = options.nodeCache.merge(result.nodes);
options.edgeCache = options.edgeCache.merge(result.edge);

result = NodesLayout.doLayout(
nodeSets.addNode15.nodes,
nodeSets.addNode15.edges,
options
);

nodes = result.nodes.toJS();

expect(nodes.n1.x).toBeGreaterThan(nodes.n5.x);
expect(nodes.n1.y).toEqual(nodes.n5.y);
});
//
// it('adds a new node to existing layout in a line', () => {
// let result = NodesLayout.doLayout(
// nodeSets.initial4.nodes,
// nodeSets.initial4.edges);
//
// nodes = result.nodes.toJS();
//
// coords = getNodeCoordinates(result.nodes);
// options.cachedLayout = result;
// options.nodeCache = options.nodeCache.merge(result.nodes);
// options.edgeCache = options.edgeCache.merge(result.edge);
//
// result = NodesLayout.doLayout(
// nodeSets.addNode15.nodes,
// nodeSets.addNode15.edges,
// options
// );
//
// nodes = result.nodes.toJS();
//
// expect(nodes.n1.x).toBeGreaterThan(nodes.n5.x);
// expect(nodes.n1.y).toEqual(nodes.n5.y);
// });
});
64 changes: 52 additions & 12 deletions client/app/scripts/charts/nodes-layout.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,22 @@ function runLayoutEngine(graph, imNodes, imEdges, opts) {

// return object with the width and height of layout
return {
graphWidth: layout.width,
graphHeight: layout.height,
width: layout.width,
height: layout.height,
nodes,
edges
};
}

export function doLayoutNewNodesOfExistingRank(layout, immNodes, immEdges, opts) {
console.log(opts);
// determine new nodes
// layout new nodes
// return layout
}

/**
* Add coordinates to 0-degree nodes using a square layout
* Depending on the previous layout run's graph aspect ratio, the square will be
Expand All @@ -142,7 +151,9 @@ function layoutSingleNodes(layout, opts) {
const nodesep = scale(NODE_SEPARATION_FACTOR);
const nodeWidth = scale(NODE_SIZE_FACTOR);
const nodeHeight = scale(NODE_SIZE_FACTOR);
const aspectRatio = layout.height ? layout.width / layout.height : 1;
const graphHeight = layout.graphHeight || layout.height;
const graphWidth = layout.graphWidth || layout.width;
const aspectRatio = graphHeight ? graphWidth / graphHeight : 1;

let nodes = layout.nodes;

Expand Down Expand Up @@ -274,11 +285,29 @@ export function hasUnseenNodes(nodes, cache) {
return hasUnseen;
}

/**
* Determine if all new nodes are 0-degree nodes
* Requires cached nodes (implies a previous layout run).
* @param {Map} nodes new Map of nodes
* @param {Map} cache old Map of nodes
* @return {Boolean} True if all new nodes are 0-nodes
*/
function hasNewSingleNode(nodes, cache) {
return (ImmSet
.fromKeys(nodes)
.subtract(ImmSet.fromKeys(cache))
.every(key => nodes.getIn([key, 'degree']) === 0));
const oldNodes = ImmSet.fromKeys(cache);
const newNodes = ImmSet.fromKeys(nodes).subtract(oldNodes);
const hasNewSingleNodes = newNodes.every(key => nodes.getIn([key, 'degree']) === 0);
return oldNodes.size > 0 && hasNewSingleNodes;
}

/**
* Determine if all new nodes are of existing ranks
* Requires cached nodes (implies a previous layout run).
* @param {Map} nodes new Map of nodes
* @param {Map} cache old Map of nodes
* @return {Boolean} True if all new nodes have a rank that already exists
*/
function hasNewNodesOfExistingRank(nodes, cache) {
return false && nodes && cache;
}

/**
Expand Down Expand Up @@ -322,7 +351,8 @@ function cloneLayout(layout, nodes, edges) {
*/
function copyLayoutProperties(layout, nodeCache, edgeCache) {
const result = Object.assign({}, layout);
result.nodes = layout.nodes.map(node => node.merge(nodeCache.get(node.get('id'))));
result.nodes = layout.nodes.map(node => (nodeCache.has(node.get('id'))
? node.merge(nodeCache.get(node.get('id'))) : node));
result.edges = layout.edges.map(edge => {
if (edgeCache.has(edge.get('id'))
&& hasSameEndpoints(edgeCache.get(edge.get('id')), result.nodes)) {
Expand All @@ -347,7 +377,7 @@ export function doLayout(immNodes, immEdges, opts) {
const cacheId = buildTopologyCacheId(options.topologyId, options.topologyOptions);

// one engine and node and edge caches per topology, to keep renderings similar
if (!topologyCaches[cacheId]) {
if (options.noCache || !topologyCaches[cacheId]) {
topologyCaches[cacheId] = {
nodeCache: makeMap(),
edgeCache: makeMap(),
Expand All @@ -359,22 +389,32 @@ export function doLayout(immNodes, immEdges, opts) {
const cachedLayout = options.cachedLayout || cache.cachedLayout;
const nodeCache = options.nodeCache || cache.nodeCache;
const edgeCache = options.edgeCache || cache.edgeCache;
const useCache = !options.forceRelayout && cachedLayout && nodeCache && edgeCache;
let layout;

++layoutRuns;
if (!options.forceRelayout && cachedLayout && nodeCache && edgeCache
&& !hasUnseenNodes(immNodes, nodeCache)) {
if (useCache && !hasUnseenNodes(immNodes, nodeCache)) {
log('skip layout, trivial adjustment', ++layoutRunsTrivial, layoutRuns);
layout = cloneLayout(cachedLayout, immNodes, immEdges);
// copy old properties, works also if nodes get re-added
layout = copyLayoutProperties(layout, nodeCache, edgeCache);
} else {
const graph = cache.graph;
const nodesWithDegrees = updateNodeDegrees(immNodes, immEdges);
if (hasNewSingleNode(nodesWithDegrees, nodeCache)) {
layout = cloneLayout(cachedLayout, immNodes, immEdges);
if (useCache && hasNewSingleNode(nodesWithDegrees, nodeCache)) {
// special case: new nodes are 0-degree nodes, no need for layout run,
// they will be layed out further below
log('skip layout, only 0-degree node(s) added');
layout = cloneLayout(cachedLayout, nodesWithDegrees, immEdges);
layout = copyLayoutProperties(layout, nodeCache, edgeCache);
} else if (useCache && hasNewNodesOfExistingRank(nodesWithDegrees, nodeCache)) {
// special case: few new nodes were added, no need for layout run,
// they will inserted according to ranks
log('skip layout, used rank-based insertion');
layout = cloneLayout(cachedLayout, nodesWithDegrees, immEdges);
layout = copyLayoutProperties(layout, nodeCache, edgeCache);
layout = doLayoutNewNodesOfExistingRank(layout, nodesWithDegrees, immEdges);
} else {
const graph = cache.graph;
layout = runLayoutEngine(graph, nodesWithDegrees, immEdges, opts);
if (!layout) {
return layout;
Expand Down

0 comments on commit 073a5d9

Please sign in to comment.