Commit 58af5194 authored by Jason Davies's avatar Jason Davies
Browse files

Fix hierarchy.revalue.

Post-order traversal alone causes all parent values to be reset to zero
*after* accumulating child values.

An additional pre-order traversal resets all parent values to zero
first, and the post-order traversal can then accumulate child values in
their parents.

This only affects sticky treemaps.
parent 61c568f8
...@@ -6377,11 +6377,18 @@ ...@@ -6377,11 +6377,18 @@
return hierarchy; return hierarchy;
}; };
hierarchy.revalue = function(root) { hierarchy.revalue = function(root) {
if (value) d3_layout_hierarchyVisitAfter(root, function(node) { if (value) {
var parent; d3_layout_hierarchyVisitBefore(root, function(node) {
node.value = node.children ? 0 : +value.call(hierarchy, node, node.depth) || 0; if (node.children) node.value = 0;
if (parent = node.parent) parent.value += node.value; });
}); d3_layout_hierarchyVisitAfter(root, function(node) {
var parent;
if (!node.children) {
node.value = +value.call(hierarchy, node, node.depth) || 0;
}
if (parent = node.parent) parent.value += node.value;
});
}
return root; return root;
}; };
return hierarchy; return hierarchy;
......
This diff is collapsed.
...@@ -60,11 +60,18 @@ d3.layout.hierarchy = function() { ...@@ -60,11 +60,18 @@ d3.layout.hierarchy = function() {
// Re-evaluates the `value` property for the specified hierarchy. // Re-evaluates the `value` property for the specified hierarchy.
hierarchy.revalue = function(root) { hierarchy.revalue = function(root) {
if (value) d3_layout_hierarchyVisitAfter(root, function(node) { if (value) {
var parent; d3_layout_hierarchyVisitBefore(root, function(node) {
node.value = node.children ? 0 : +value.call(hierarchy, node, node.depth) || 0; if (node.children) node.value = 0;
if (parent = node.parent) parent.value += node.value; });
}); d3_layout_hierarchyVisitAfter(root, function(node) {
var parent;
if (!node.children) {
node.value = +value.call(hierarchy, node, node.depth) || 0;
}
if (parent = node.parent) parent.value += node.value;
});
}
return root; return root;
}; };
......
...@@ -26,6 +26,13 @@ suite.addBatch({ ...@@ -26,6 +26,13 @@ suite.addBatch({
nodes = h.children(function() { return null; }).nodes({children: [{}]}); nodes = h.children(function() { return null; }).nodes({children: [{}]});
assert.equal(nodes[0].value, 0); assert.equal(nodes[0].value, 0);
assert.isUndefined(nodes[0].children); assert.isUndefined(nodes[0].children);
},
"revalue": function(hierarchy) {
var h = hierarchy().sticky(true),
nodes = h.nodes({children: [{children: [{value: 1}, {value: 2}]}, {value: 3}]});
assert.equal(nodes[0].value, 6);
h(nodes[0]); // calls hierarchy.revalue
assert.equal(nodes[0].value, 6);
} }
} }
}); });
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment