Comparing version 2.0.0-rc.4 to 2.0.0-rc.5
@@ -1,2 +0,2 @@ | ||
// https://d3js.org/d3-chord/ v2.0.0-rc.4 Copyright 2019 Mike Bostock | ||
// https://d3js.org/d3-chord/ v2.0.0-rc.5 Copyright 2019 Mike Bostock | ||
(function (global, factory) { | ||
@@ -71,3 +71,3 @@ typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('d3-path')) : | ||
if (sortGroups) groupIndex.sort((a, b) => sortGroups(groupSums[a], groupSums[b])); | ||
if (sortSubgroups) subgroupIndex.forEach((d, i) => d.sort((a, b) => sortSubgroups(matrix[i][a], matrix[i][b]))); | ||
if (sortSubgroups) subgroupIndex.forEach((d, i) => d.sort((a, b) => sortSubgroups(matrix[i][a] + directed * matrix[a][i], matrix[i][b] + directed * matrix[b][i]))); | ||
@@ -74,0 +74,0 @@ // Convert the sum to scaling factor for [0, 2pi]. |
@@ -1,2 +0,2 @@ | ||
// https://d3js.org/d3-chord/ v2.0.0-rc.4 Copyright 2019 Mike Bostock | ||
!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("d3-path")):"function"==typeof define&&define.amd?define(["exports","d3-path"],t):t((n=n||self).d3=n.d3||{},n.d3)}(this,function(n,t){"use strict";var e=Math.abs,r=Math.cos,u=Math.sin,o=Math.PI,l=o/2,a=2*o,i=Math.max,f=1e-12;function s(n){return Array.from({length:n},(n,t)=>t)}function c(n){return function(t,e){return n(t.source.value+t.target.value,e.source.value+e.target.value)}}function g(n){var t=0,e=null,r=null,u=null;function o(o){var l,f,c,g,d,p,h=o.length,A=[],y=s(h),v=[],x=[],b=x.groups=new Array(h),M=new Array(h*h);for(l=0,d=-1;++d<h;){for(f=0,p=-1;++p<h;)f+=o[d][p]+n*o[p][d];A.push(f),v.push(s(h)),l+=f}for(e&&y.sort((n,t)=>e(A[n],A[t])),r&&v.forEach((n,t)=>n.sort((n,e)=>r(o[t][n],o[t][e]))),g=(l=i(0,a-t*h)/l)?t:a/h,f=0,d=-1;++d<h;){for(c=f,p=-1;++p<h;){var T=y[d],m=v[T][p],q=o[T][m]+n*o[m][T],C=f,_=f+=q*l;M[m*h+T]={index:T,subindex:m,startAngle:C,endAngle:_,value:q}}b[T]={index:T,startAngle:c,endAngle:f,value:A[T]},f+=g}for(d=-1;++d<h;)for(p=d-1;++p<h;){var w=M[p*h+d],P=M[d*h+p],R=o[d][p],j=o[p][d];if(n){var D=R/(R+j);R&&x.push({source:{index:d,startAngle:w.startAngle*D+w.endAngle*(1-D),endAngle:w.startAngle*(1-D)+w.endAngle*D},target:{index:p,startAngle:P.startAngle*D+P.endAngle*(1-D),endAngle:P.startAngle*(1-D)+P.endAngle*D},value:R}),j&&x.push({source:{index:p,startAngle:P.startAngle*(1-D)+P.endAngle*D,endAngle:P.startAngle*D+P.endAngle*(1-D)},target:{index:d,startAngle:w.startAngle*(1-D)+w.endAngle*D,endAngle:w.startAngle*D+w.endAngle*(1-D)},value:j})}else(R||j)&&x.push(R<j?{source:P,target:w}:{source:w,target:P})}return u?x.sort(u):x}return o.padAngle=function(n){return arguments.length?(t=i(0,n),o):t},o.sortGroups=function(n){return arguments.length?(e=n,o):e},o.sortSubgroups=function(n){return arguments.length?(r=n,o):r},o.sortChords=function(n){return arguments.length?(null==n?u=null:(u=c(n))._=n,o):u&&u._},o}var d=Array.prototype.slice;function p(n){return function(){return n}}function h(n){return n.source}function A(n){return n.target}function y(n){return n.radius}function v(n){return n.startAngle}function x(n){return n.endAngle}function b(){return 0}function M(){return 10}function T(n){var o=h,a=A,i=y,s=y,c=v,g=x,M=b,T=null;function m(){var p,h=o.apply(this,arguments),A=a.apply(this,arguments),y=M.apply(this,arguments)/2,v=d.call(arguments),x=+i.apply(this,(v[0]=h,v)),b=c.apply(this,v)-l,m=g.apply(this,v)-l,q=+s.apply(this,(v[0]=A,v)),C=c.apply(this,v)-l,_=g.apply(this,v)-l;if(T||(T=p=t.path()),y>f&&(e(m-b)>2*y+f?m>b?(b+=y,m-=y):(b-=y,m+=y):b=m=(b+m)/2,e(_-C)>2*y+f?_>C?(C+=y,_-=y):(C-=y,_+=y):C=_=(C+_)/2),T.moveTo(x*r(b),x*u(b)),T.arc(0,0,x,b,m),b!==C||m!==_)if(n){var w=q-+n.apply(this,arguments),P=(C+_)/2;T.quadraticCurveTo(0,0,w*r(C),w*u(C)),T.lineTo(q*r(P),q*u(P)),T.lineTo(w*r(_),w*u(_))}else T.quadraticCurveTo(0,0,q*r(C),q*u(C)),T.arc(0,0,q,C,_);if(T.quadraticCurveTo(0,0,x*r(b),x*u(b)),T.closePath(),p)return T=null,p+""||null}return n&&(m.headRadius=function(t){return arguments.length?(n="function"==typeof t?t:p(+t),m):n}),m.radius=function(n){return arguments.length?(i=s="function"==typeof n?n:p(+n),m):i},m.sourceRadius=function(n){return arguments.length?(i="function"==typeof n?n:p(+n),m):i},m.targetRadius=function(n){return arguments.length?(s="function"==typeof n?n:p(+n),m):s},m.startAngle=function(n){return arguments.length?(c="function"==typeof n?n:p(+n),m):c},m.endAngle=function(n){return arguments.length?(g="function"==typeof n?n:p(+n),m):g},m.padAngle=function(n){return arguments.length?(M="function"==typeof n?n:p(+n),m):M},m.source=function(n){return arguments.length?(o=n,m):o},m.target=function(n){return arguments.length?(a=n,m):a},m.context=function(n){return arguments.length?(T=null==n?null:n,m):T},m}n.chord=function(){return g(!1)},n.chordDirected=function(){return g(!0)},n.ribbon=function(){return T()},n.ribbonArrow=function(){return T(M)},Object.defineProperty(n,"__esModule",{value:!0})}); | ||
// https://d3js.org/d3-chord/ v2.0.0-rc.5 Copyright 2019 Mike Bostock | ||
!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?t(exports,require("d3-path")):"function"==typeof define&&define.amd?define(["exports","d3-path"],t):t((n=n||self).d3=n.d3||{},n.d3)}(this,function(n,t){"use strict";var e=Math.abs,r=Math.cos,u=Math.sin,o=Math.PI,l=o/2,a=2*o,i=Math.max,f=1e-12;function s(n){return Array.from({length:n},(n,t)=>t)}function c(n){return function(t,e){return n(t.source.value+t.target.value,e.source.value+e.target.value)}}function g(n){var t=0,e=null,r=null,u=null;function o(o){var l,f,c,g,d,p,h=o.length,A=[],y=s(h),v=[],x=[],b=x.groups=new Array(h),M=new Array(h*h);for(l=0,d=-1;++d<h;){for(f=0,p=-1;++p<h;)f+=o[d][p]+n*o[p][d];A.push(f),v.push(s(h)),l+=f}for(e&&y.sort((n,t)=>e(A[n],A[t])),r&&v.forEach((t,e)=>t.sort((t,u)=>r(o[e][t]+n*o[t][e],o[e][u]+n*o[u][e]))),g=(l=i(0,a-t*h)/l)?t:a/h,f=0,d=-1;++d<h;){for(c=f,p=-1;++p<h;){var T=y[d],m=v[T][p],q=o[T][m]+n*o[m][T],C=f,_=f+=q*l;M[m*h+T]={index:T,subindex:m,startAngle:C,endAngle:_,value:q}}b[T]={index:T,startAngle:c,endAngle:f,value:A[T]},f+=g}for(d=-1;++d<h;)for(p=d-1;++p<h;){var w=M[p*h+d],P=M[d*h+p],R=o[d][p],j=o[p][d];if(n){var D=R/(R+j);R&&x.push({source:{index:d,startAngle:w.startAngle*D+w.endAngle*(1-D),endAngle:w.startAngle*(1-D)+w.endAngle*D},target:{index:p,startAngle:P.startAngle*D+P.endAngle*(1-D),endAngle:P.startAngle*(1-D)+P.endAngle*D},value:R}),j&&x.push({source:{index:p,startAngle:P.startAngle*(1-D)+P.endAngle*D,endAngle:P.startAngle*D+P.endAngle*(1-D)},target:{index:d,startAngle:w.startAngle*(1-D)+w.endAngle*D,endAngle:w.startAngle*D+w.endAngle*(1-D)},value:j})}else(R||j)&&x.push(R<j?{source:P,target:w}:{source:w,target:P})}return u?x.sort(u):x}return o.padAngle=function(n){return arguments.length?(t=i(0,n),o):t},o.sortGroups=function(n){return arguments.length?(e=n,o):e},o.sortSubgroups=function(n){return arguments.length?(r=n,o):r},o.sortChords=function(n){return arguments.length?(null==n?u=null:(u=c(n))._=n,o):u&&u._},o}var d=Array.prototype.slice;function p(n){return function(){return n}}function h(n){return n.source}function A(n){return n.target}function y(n){return n.radius}function v(n){return n.startAngle}function x(n){return n.endAngle}function b(){return 0}function M(){return 10}function T(n){var o=h,a=A,i=y,s=y,c=v,g=x,M=b,T=null;function m(){var p,h=o.apply(this,arguments),A=a.apply(this,arguments),y=M.apply(this,arguments)/2,v=d.call(arguments),x=+i.apply(this,(v[0]=h,v)),b=c.apply(this,v)-l,m=g.apply(this,v)-l,q=+s.apply(this,(v[0]=A,v)),C=c.apply(this,v)-l,_=g.apply(this,v)-l;if(T||(T=p=t.path()),y>f&&(e(m-b)>2*y+f?m>b?(b+=y,m-=y):(b-=y,m+=y):b=m=(b+m)/2,e(_-C)>2*y+f?_>C?(C+=y,_-=y):(C-=y,_+=y):C=_=(C+_)/2),T.moveTo(x*r(b),x*u(b)),T.arc(0,0,x,b,m),b!==C||m!==_)if(n){var w=q-+n.apply(this,arguments),P=(C+_)/2;T.quadraticCurveTo(0,0,w*r(C),w*u(C)),T.lineTo(q*r(P),q*u(P)),T.lineTo(w*r(_),w*u(_))}else T.quadraticCurveTo(0,0,q*r(C),q*u(C)),T.arc(0,0,q,C,_);if(T.quadraticCurveTo(0,0,x*r(b),x*u(b)),T.closePath(),p)return T=null,p+""||null}return n&&(m.headRadius=function(t){return arguments.length?(n="function"==typeof t?t:p(+t),m):n}),m.radius=function(n){return arguments.length?(i=s="function"==typeof n?n:p(+n),m):i},m.sourceRadius=function(n){return arguments.length?(i="function"==typeof n?n:p(+n),m):i},m.targetRadius=function(n){return arguments.length?(s="function"==typeof n?n:p(+n),m):s},m.startAngle=function(n){return arguments.length?(c="function"==typeof n?n:p(+n),m):c},m.endAngle=function(n){return arguments.length?(g="function"==typeof n?n:p(+n),m):g},m.padAngle=function(n){return arguments.length?(M="function"==typeof n?n:p(+n),m):M},m.source=function(n){return arguments.length?(o=n,m):o},m.target=function(n){return arguments.length?(a=n,m):a},m.context=function(n){return arguments.length?(T=null==n?null:n,m):T},m}n.chord=function(){return g(!1)},n.chordDirected=function(){return g(!0)},n.ribbon=function(){return T()},n.ribbonArrow=function(){return T(M)},Object.defineProperty(n,"__esModule",{value:!0})}); |
{ | ||
"name": "d3-chord", | ||
"version": "2.0.0-rc.4", | ||
"version": "2.0.0-rc.5", | ||
"publishConfig": { | ||
@@ -5,0 +5,0 @@ "tag": "next" |
@@ -57,3 +57,3 @@ import {max, tau} from "./math.js"; | ||
if (sortGroups) groupIndex.sort((a, b) => sortGroups(groupSums[a], groupSums[b])); | ||
if (sortSubgroups) subgroupIndex.forEach((d, i) => d.sort((a, b) => sortSubgroups(matrix[i][a], matrix[i][b]))); | ||
if (sortSubgroups) subgroupIndex.forEach((d, i) => d.sort((a, b) => sortSubgroups(matrix[i][a] + directed * matrix[a][i], matrix[i][b] + directed * matrix[b][i]))); | ||
@@ -60,0 +60,0 @@ // Convert the sum to scaling factor for [0, 2pi]. |
38390