|
6401 | 6401 | return randomUniform.source = sourceRandomUniform, randomUniform;
|
6402 | 6402 | }(defaultSource$1), int = function sourceRandomInt(source) {
|
6403 | 6403 | function randomInt(min, max) {
|
6404 |
| - return arguments.length < 2 && (max = min, min = 0), min = Math.floor(min), max = Math.floor(max) - min, function() { |
| 6404 | + return arguments.length < 2 && (max = min, min = 0), max = Math.floor(max) - (min = Math.floor(min)), function() { |
6405 | 6405 | return Math.floor(source() * max + min);
|
6406 | 6406 | };
|
6407 | 6407 | }
|
|
6412 | 6412 | return mu = null == mu ? 0 : +mu, sigma = null == sigma ? 1 : +sigma, function() {
|
6413 | 6413 | var y;
|
6414 | 6414 | if (null != x) y = x, x = null;
|
6415 |
| - else do x = 2 * source() - 1, y = 2 * source() - 1, r = x * x + y * y; |
| 6415 | + else do r = (x = 2 * source() - 1) * x + (y = 2 * source() - 1) * y; |
6416 | 6416 | while (!r || r > 1)
|
6417 | 6417 | return mu + sigma * y * Math.sqrt(-2 * Math.log(r) / r);
|
6418 | 6418 | };
|
|
6685 | 6685 | var transform, untransform, unknown, piecewise, output, input, domain = unit, range = unit, interpolate$1 = interpolate, clamp = identity$6;
|
6686 | 6686 | function rescale() {
|
6687 | 6687 | var a, b, t, n = Math.min(domain.length, range.length);
|
6688 |
| - return clamp !== identity$6 && (a = domain[0], b = domain[n - 1], a > b && (t = a, a = b, b = t), clamp = function(x) { |
| 6688 | + return clamp !== identity$6 && ((a = domain[0]) > (b = domain[n - 1]) && (t = a, a = b, b = t), clamp = function(x) { |
6689 | 6689 | return Math.max(a, Math.min(b, x));
|
6690 | 6690 | }), piecewise = n > 2 ? polymap : bimap, output = input = null, scale;
|
6691 | 6691 | }
|
|
7419 | 7419 | return pad$1(d.getFullYear() % 100, p, 2);
|
7420 | 7420 | }
|
7421 | 7421 | function formatYearISO(d, p) {
|
7422 |
| - return d = dISO(d), pad$1(d.getFullYear() % 100, p, 2); |
| 7422 | + return pad$1((d = dISO(d)).getFullYear() % 100, p, 2); |
7423 | 7423 | }
|
7424 | 7424 | function formatFullYear(d, p) {
|
7425 | 7425 | return pad$1(d.getFullYear() % 10000, p, 4);
|
7426 | 7426 | }
|
7427 | 7427 | function formatFullYearISO(d, p) {
|
7428 | 7428 | var day = d.getDay();
|
7429 |
| - return d = day >= 4 || 0 === day ? thursday(d) : thursday.ceil(d), pad$1(d.getFullYear() % 10000, p, 4); |
| 7429 | + return pad$1((d = day >= 4 || 0 === day ? thursday(d) : thursday.ceil(d)).getFullYear() % 10000, p, 4); |
7430 | 7430 | }
|
7431 | 7431 | function formatZone(d) {
|
7432 | 7432 | var z = d.getTimezoneOffset();
|
|
7483 | 7483 | return pad$1(d.getUTCFullYear() % 100, p, 2);
|
7484 | 7484 | }
|
7485 | 7485 | function formatUTCYearISO(d, p) {
|
7486 |
| - return d = UTCdISO(d), pad$1(d.getUTCFullYear() % 100, p, 2); |
| 7486 | + return pad$1((d = UTCdISO(d)).getUTCFullYear() % 100, p, 2); |
7487 | 7487 | }
|
7488 | 7488 | function formatUTCFullYear(d, p) {
|
7489 | 7489 | return pad$1(d.getUTCFullYear() % 10000, p, 4);
|
7490 | 7490 | }
|
7491 | 7491 | function formatUTCFullYearISO(d, p) {
|
7492 | 7492 | var day = d.getUTCDay();
|
7493 |
| - return d = day >= 4 || 0 === day ? utcThursday(d) : utcThursday.ceil(d), pad$1(d.getUTCFullYear() % 10000, p, 4); |
| 7493 | + return pad$1((d = day >= 4 || 0 === day ? utcThursday(d) : utcThursday.ceil(d)).getUTCFullYear() % 10000, p, 4); |
7494 | 7494 | }
|
7495 | 7495 | function formatUTCZone() {
|
7496 | 7496 | return "+0000";
|
|
7710 | 7710 | };
|
7711 | 7711 | }
|
7712 | 7712 | return scale.domain = function(_) {
|
7713 |
| - return arguments.length ? ([x0, x1] = _, t0 = transform(x0 = +x0), t1 = transform(x1 = +x1), k10 = t0 === t1 ? 0 : 1 / (t1 - t0), scale) : [ |
| 7713 | + return arguments.length ? ([x0, x1] = _, k10 = (t0 = transform(x0 = +x0)) === (t1 = transform(x1 = +x1)) ? 0 : 1 / (t1 - t0), scale) : [ |
7714 | 7714 | x0,
|
7715 | 7715 | x1
|
7716 | 7716 | ];
|
|
7721 | 7721 | }, scale.range = range(interpolate), scale.rangeRound = range(interpolateRound), scale.unknown = function(_) {
|
7722 | 7722 | return arguments.length ? (unknown = _, scale) : unknown;
|
7723 | 7723 | }, function(t) {
|
7724 |
| - return transform = t, t0 = t(x0), t1 = t(x1), k10 = t0 === t1 ? 0 : 1 / (t1 - t0), scale; |
| 7724 | + return transform = t, k10 = (t0 = t(x0)) === (t1 = t(x1)) ? 0 : 1 / (t1 - t0), scale; |
7725 | 7725 | };
|
7726 | 7726 | }
|
7727 | 7727 | function copy$1(source, target) {
|
|
9389 | 9389 | if (data) {
|
9390 | 9390 | if (data.index > node.index) {
|
9391 | 9391 | var x = xi - data.x - data.vx, y = yi - data.y - data.vy, l = x * x + y * y;
|
9392 |
| - l < r * r && (0 === x && (x = jiggle(random), l += x * x), 0 === y && (y = jiggle(random), l += y * y), l = (r - (l = Math.sqrt(l))) / l * strength, node.vx += (x *= l) * (r = (rj *= rj) / (ri2 + rj)), node.vy += (y *= l) * r, data.vx -= x * (r = 1 - r), data.vy -= y * r); |
| 9392 | + l < r * r && (0 === x && (l += (x = jiggle(random)) * x), 0 === y && (l += (y = jiggle(random)) * y), l = (r - (l = Math.sqrt(l))) / l * strength, node.vx += (x *= l) * (r = (rj *= rj) / (ri2 + rj)), node.vy += (y *= l) * r, data.vx -= x * (r = 1 - r), data.vy -= y * r); |
9393 | 9393 | }
|
9394 | 9394 | return;
|
9395 | 9395 | }
|
|
9420 | 9420 | return 1 / Math.min(count[link.source.index], count[link.target.index]);
|
9421 | 9421 | }, distance = constant$7(30), iterations = 1;
|
9422 | 9422 | function force(alpha) {
|
9423 |
| - for(var k = 0, n = links.length; k < iterations; ++k)for(var link, source, target, x, y, l, b, i = 0; i < n; ++i)source = (link = links[i]).source, x = (target = link.target).x + target.vx - source.x - source.vx || jiggle(random), y = target.y + target.vy - source.y - source.vy || jiggle(random), l = ((l = Math.sqrt(x * x + y * y)) - distances[i]) / l * alpha * strengths[i], x *= l, y *= l, target.vx -= x * (b = bias[i]), target.vy -= y * b, source.vx += x * (b = 1 - b), source.vy += y * b; |
| 9423 | + for(var k = 0, n = links.length; k < iterations; ++k)for(var link, source, target, x, y, l, b, i = 0; i < n; ++i)source = (link = links[i]).source, l = ((l = Math.sqrt((x = (target = link.target).x + target.vx - source.x - source.vx || jiggle(random)) * x + (y = target.y + target.vy - source.y - source.vy || jiggle(random)) * y)) - distances[i]) / l * alpha * strengths[i], x *= l, y *= l, target.vx -= x * (b = bias[i]), target.vy -= y * b, source.vx += x * (b = 1 - b), source.vy += y * b; |
9424 | 9424 | }
|
9425 | 9425 | function initialize() {
|
9426 | 9426 | if (nodes) {
|
|
9479 | 9479 | function apply(quad, x1, _, x2) {
|
9480 | 9480 | if (!quad.value) return !0;
|
9481 | 9481 | var x = quad.x - node.x, y = quad.y - node.y, w = x2 - x1, l = x * x + y * y;
|
9482 |
| - if (w * w / theta2 < l) return l < distanceMax2 && (0 === x && (x = jiggle(random), l += x * x), 0 === y && (y = jiggle(random), l += y * y), l < distanceMin2 && (l = Math.sqrt(distanceMin2 * l)), node.vx += x * quad.value * alpha / l, node.vy += y * quad.value * alpha / l), !0; |
| 9482 | + if (w * w / theta2 < l) return l < distanceMax2 && (0 === x && (l += (x = jiggle(random)) * x), 0 === y && (l += (y = jiggle(random)) * y), l < distanceMin2 && (l = Math.sqrt(distanceMin2 * l)), node.vx += x * quad.value * alpha / l, node.vy += y * quad.value * alpha / l), !0; |
9483 | 9483 | if (!quad.length && !(l >= distanceMax2)) {
|
9484 |
| - (quad.data !== node || quad.next) && (0 === x && (x = jiggle(random), l += x * x), 0 === y && (y = jiggle(random), l += y * y), l < distanceMin2 && (l = Math.sqrt(distanceMin2 * l))); |
| 9484 | + (quad.data !== node || quad.next) && (0 === x && (l += (x = jiggle(random)) * x), 0 === y && (l += (y = jiggle(random)) * y), l < distanceMin2 && (l = Math.sqrt(distanceMin2 * l))); |
9485 | 9485 | do quad.data !== node && (w = strengths[quad.data.index] * alpha / l, node.vx += x * w, node.vy += y * w);
|
9486 | 9486 | while (quad = quad.next)
|
9487 | 9487 | }
|
|
9582 | 9582 | },
|
9583 | 9583 | find: function(x, y, radius) {
|
9584 | 9584 | var dx, dy, d2, node, closest, i = 0, n = nodes.length;
|
9585 |
| - for(null == radius ? radius = 1 / 0 : radius *= radius, i = 0; i < n; ++i)node = nodes[i], (d2 = (dx = x - node.x) * dx + (dy = y - node.y) * dy) < radius && (closest = node, radius = d2); |
| 9585 | + for(null == radius ? radius = 1 / 0 : radius *= radius, i = 0; i < n; ++i)(d2 = (dx = x - (node = nodes[i]).x) * dx + (dy = y - node.y) * dy) < radius && (closest = node, radius = d2); |
9586 | 9586 | return closest;
|
9587 | 9587 | },
|
9588 | 9588 | on: function(name, _) {
|
|
0 commit comments