diff --git a/_layouts/stats.html b/_layouts/stats.html
index a321832..c46b50d 100644
--- a/_layouts/stats.html
+++ b/_layouts/stats.html
@@ -187,7 +187,7 @@
{{distro}} {{hist_values[1] | size}} repos
.domain([1, max_age])
.range([0, width]);
- // Generate a histogram using twenty uniformly-spaced bins.
+ // Generate a histogram using thirty uniformly-spaced bins.
var histogram = d3.histogram()
.domain(x.domain())
.thresholds(x.ticks(30))
diff --git a/js/jquery/jquery-3.7.1.min.js b/js/jquery/jquery-3.7.1.min.js
index 7f37b5d..8559edf 100644
--- a/js/jquery/jquery-3.7.1.min.js
+++ b/js/jquery/jquery-3.7.1.min.js
@@ -1,2 +1,3 @@
+// https://cdnjs.cloudflare.com/ajax/libs/jquery/3.7.1/jquery.min.js
/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */
!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,""],col:[2,""],tr:[2,""],td:[3,""],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0= Math.min(sets[left].size,
- sets[right].size)) {
- weight = 0;
- }
-
- setOverlaps[left].push ({set:right, size:current.size, weight:weight});
- setOverlaps[right].push({set:left, size:current.size, weight:weight});
- }
-
- // get list of most overlapped sets
- var mostOverlapped = [];
- for (var set in setOverlaps) {
- if (setOverlaps.hasOwnProperty(set)) {
- var size = 0;
- for (i = 0; i < setOverlaps[set].length; ++i) {
- size += setOverlaps[set][i].size * setOverlaps[set][i].weight;
- }
-
- mostOverlapped.push({set: set, size:size});
- }
- }
-
- // sort by size desc
- function sortOrder(a,b) {
- return b.size - a.size;
- }
- mostOverlapped.sort(sortOrder);
-
- // keep track of what sets have been laid out
- var positioned = {};
- function isPositioned(element) {
- return element.set in positioned;
- }
-
- // adds a point to the output
- function positionSet(point, index) {
- sets[index].x = point.x;
- sets[index].y = point.y;
- positioned[index] = true;
- }
-
- // add most overlapped set at (0,0)
- positionSet({x: 0, y: 0}, mostOverlapped[0].set);
-
- // get distances between all points
- var distances = venn.getDistanceMatrix(sets, overlaps);
-
- for (i = 1; i < mostOverlapped.length; ++i) {
- var setIndex = mostOverlapped[i].set,
- overlap = setOverlaps[setIndex].filter(isPositioned);
- set = sets[setIndex];
- overlap.sort(sortOrder);
-
- if (overlap.length === 0) {
- throw "Need overlap information for set " + JSON.stringify( set );
- }
-
- var points = [];
- for (var j = 0; j < overlap.length; ++j) {
- // get appropriate distance from most overlapped already added set
- var p1 = sets[overlap[j].set],
- d1 = distances[setIndex][overlap[j].set];
-
- // sample positions at 90 degrees for maximum aesthetics
- points.push({x : p1.x + d1, y : p1.y});
- points.push({x : p1.x - d1, y : p1.y});
- points.push({y : p1.y + d1, x : p1.x});
- points.push({y : p1.y - d1, x : p1.x});
-
- // if we have at least 2 overlaps, then figure out where the
- // set should be positioned analytically and try those too
- for (var k = j + 1; k < overlap.length; ++k) {
- var p2 = sets[overlap[k].set],
- d2 = distances[setIndex][overlap[k].set];
-
- var extraPoints = venn.circleCircleIntersection(
- { x: p1.x, y: p1.y, radius: d1},
- { x: p2.x, y: p2.y, radius: d2});
-
- for (var l = 0; l < extraPoints.length; ++l) {
- points.push(extraPoints[l]);
- }
- }
- }
-
- // we have some candidate positions for the set, examine loss
- // at each position to figure out where to put it at
- var bestLoss = 1e50, bestPoint = points[0];
- for (j = 0; j < points.length; ++j) {
- sets[setIndex].x = points[j].x;
- sets[setIndex].y = points[j].y;
- var loss = venn.lossFunction(sets, overlaps);
- if (loss < bestLoss) {
- bestLoss = loss;
- bestPoint = points[j];
- }
- }
-
- positionSet(bestPoint, setIndex);
- }
-
- return sets;
- };
-
- /// Uses multidimensional scaling to approximate a first layout here
- venn.classicMDSLayout = function(sets, overlaps) {
- // get the distance matrix
- var distances = venn.getDistanceMatrix(sets, overlaps);
-
- // get positions for each set
- var positions = mds.classic(distances);
-
- // translate back to (x,y,radius) coordinates
- for (var i = 0; i < sets.length; ++i) {
- sets[i].x = positions[i][0];
- sets[i].y = positions[i][1];
- sets[i].radius = Math.sqrt(sets[i].size / Math.PI);
- }
- return sets;
- };
-
- /** Given a bunch of sets, and the desired overlaps between these sets - computes
- the distance from the actual overlaps to the desired overlaps. Note that
- this method ignores overlaps of more than 2 circles */
- venn.lossFunction = function(sets, overlaps) {
- var output = 0;
-
- function getCircles(indices) {
- return indices.map(function(i) { return sets[i]; });
- }
-
- for (var i = 0; i < overlaps.length; ++i) {
- var area = overlaps[i], overlap;
- if (area.sets.length == 2) {
- var left = sets[area.sets[0]],
- right = sets[area.sets[1]];
- overlap = venn.circleOverlap(left.radius, right.radius,
- venn.distance(left, right));
- } else {
- overlap = venn.intersectionArea(getCircles(area.sets));
- }
-
- var weight = (area.weight == null) ? 1.0 : area.weight;
- output += weight * (overlap - area.size) * (overlap - area.size);
- }
-
- return output;
- };
-
- /** Scales a solution from venn.venn or venn.greedyLayout such that it fits in
- a rectangle of width/height - with padding around the borders. also
- centers the diagram in the available space at the same time */
- venn.scaleSolution = function(solution, width, height, padding) {
- var minMax = function(d) {
- var hi = Math.max.apply(null, solution.map(
- function(c) { return c[d] + c.radius; } )),
- lo = Math.min.apply(null, solution.map(
- function(c) { return c[d] - c.radius;} ));
- return {max:hi, min:lo};
- };
-
- width -= 2*padding;
- height -= 2*padding;
-
- var xRange = minMax('x'),
- yRange = minMax('y'),
- xScaling = width / (xRange.max - xRange.min),
- yScaling = height / (yRange.max - yRange.min),
- scaling = Math.min(yScaling, xScaling),
-
- // while we're at it, center the diagram too
- xOffset = (width - (xRange.max - xRange.min) * scaling) / 2,
- yOffset = (height - (yRange.max - yRange.min) * scaling) / 2;
-
- for (var i = 0; i < solution.length; ++i) {
- var set = solution[i];
- set.radius = scaling * set.radius;
- set.x = padding + xOffset + (set.x - xRange.min) * scaling;
- set.y = padding + yOffset + (set.y - yRange.min) * scaling;
- }
-
- return solution;
- };
-
- // sometimes text doesn't fit inside the circle, if thats the case lets wrap
- // the text here such that it fits
- // todo: looks like this might be merged into d3 (
- // https://github.com/mbostock/d3/issues/1642),
- // also worth checking out is
- // http://engineering.findthebest.com/wrapping-axis-labels-in-d3-js/
- // this seems to be one of those things that should be easy but isn't
- function wrapText() {
- var text = d3.select(this),
- data = text.datum(),
- width = data.radius,
- words = data.label.split(/\s+/).reverse(),
- maxLines = 3,
- minChars = (data.label.length + words.length) / maxLines,
- word = words.pop(),
- line = [word],
- joined,
- lineNumber = 0,
- lineHeight = 1.1, // ems
- tspan = text.text(null).append("tspan").text(word);
-
- while (word = words.pop()) {
- line.push(word);
- joined = line.join(" ");
- tspan.text(joined);
- if (joined.length > minChars && tspan.node().getComputedTextLength() > width) {
- line.pop();
- tspan.text(line.join(" "));
- line = [word];
- tspan = text.append("tspan").text(word);
- lineNumber++;
- }
- }
-
- var initial = 0.35 - lineNumber * lineHeight / 2,
- x = Math.floor(data.textCenter.x),
- y = Math.floor(data.textCenter.y);
-
- text.selectAll("tspan")
- .attr("x", x)
- .attr("y", y)
- .attr("dy", function(d, i) {
- return (initial + i * lineHeight) + "em";
- });
- }
-
- /** finds the zeros of a function, given two starting points (which must
- * have opposite signs */
- venn.bisect = function(f, a, b, parameters) {
- parameters = parameters || {};
- var maxIterations = parameters.maxIterations || 100,
- tolerance = parameters.tolerance || 1e-10,
- fA = f(a),
- fB = f(b),
- delta = b - a;
-
- if (fA * fB > 0) {
- throw "Initial bisect points must have opposite signs";
- }
-
- if (fA === 0) return a;
- if (fB === 0) return b;
-
- for (var i = 0; i < maxIterations; ++i) {
- delta /= 2;
- var mid = a + delta,
- fMid = f(mid);
-
- if (fMid * fA >= 0) {
- a = mid;
- }
-
- if ((Math.abs(delta) < tolerance) || (fMid === 0)) {
- return mid;
- }
- }
- return a + delta;
- };
-
-
- function weightedSum(ret, w1, v1, w2, v2) {
- for (var j = 0; j < ret.length; ++j) {
- ret[j] = w1 * v1[j] + w2 * v2[j]
- }
- }
-
- /** minimizes a function using the downhill simplex method */
- venn.fmin = function(f, x0, parameters) {
- parameters = parameters || {};
-
- var maxIterations = parameters.maxIterations || x0.length * 200,
- nonZeroDelta = parameters.nonZeroDelta || 1.1,
- zeroDelta = parameters.zeroDelta || 0.001,
- minErrorDelta = parameters.minErrorDelta || 1e-5,
- rho = parameters.rho || 1,
- chi = parameters.chi || 2,
- psi = parameters.psi || -0.5,
- sigma = parameters.sigma || 0.5,
- callback = parameters.callback,
- temp;
-
- // initialize simplex.
- var N = x0.length,
- simplex = new Array(N + 1);
- simplex[0] = x0;
- simplex[0].fx = f(x0);
- for (var i = 0; i < N; ++i) {
- var point = x0.slice();
- point[i] = point[i] ? point[i] * nonZeroDelta : zeroDelta;
- simplex[i+1] = point;
- simplex[i+1].fx = f(point);
- }
-
- var sortOrder = function(a, b) { return a.fx - b.fx; };
-
- var centroid = x0.slice(),
- reflected = x0.slice(),
- contracted = x0.slice(),
- expanded = x0.slice();
-
- for (var iteration = 0; iteration < maxIterations; ++iteration) {
- simplex.sort(sortOrder);
- if (callback) {
- callback(simplex);
- }
-
- if (Math.abs(simplex[0].fx - simplex[N].fx) < minErrorDelta) {
- break;
- }
-
- // compute the centroid of all but the worst point in the simplex
- for (i = 0; i < N; ++i) {
- centroid[i] = 0;
- for (var j = 0; j < N; ++j) {
- centroid[i] += simplex[j][i];
- }
- centroid[i] /= N;
- }
-
- // reflect the worst point past the centroid and compute loss at reflected
- // point
- var worst = simplex[N];
- weightedSum(reflected, 1+rho, centroid, -rho, worst);
- reflected.fx = f(reflected);
-
- // if the reflected point is the best seen, then possibly expand
- if (reflected.fx <= simplex[0].fx) {
- weightedSum(expanded, 1+chi, centroid, -chi, worst);
- expanded.fx = f(expanded);
- if (expanded.fx < reflected.fx) {
- temp = simplex[N];
- simplex[N] = expanded;
- expanded = temp;
- } else {
- temp = simplex[N];
- simplex[N] = reflected;
- reflected = temp;
- }
- }
-
- // if the reflected point is worse than the second worst, we need to
- // contract
- else if (reflected.fx >= simplex[N-1].fx) {
- var shouldReduce = false;
- var contracted;
-
- if (reflected.fx <= worst.fx) {
- // do an inside contraction
- weightedSum(contracted, 1+psi, centroid, -psi, worst);
- contracted.fx = f(contracted);
- if (contracted.fx < worst.fx) {
- temp = simplex[N];
- simplex[N] = contracted;
- contracted = temp;
- } else {
- shouldReduce = true;
- }
- } else {
- // do an outside contraction
- weightedSum(contracted, 1-psi * rho, centroid, psi*rho, worst);
- contracted.fx = f(contracted);
- if (contracted.fx <= reflected.fx) {
- temp = simplex[N];
- simplex[N] = contracted;
- contracted = temp;
- } else {
- shouldReduce = true;
- }
- }
-
- if (shouldReduce) {
- // do reduction. doesn't actually happen that often
- for (i = 1; i < simplex.length; ++i) {
- weightedSum(simplex[i], 1 - sigma, simplex[0], sigma - 1, simplex[i]);
- simplex[i].fx = f(simplex[i]);
- }
- }
- } else {
- temp = simplex[N];
- simplex[N] = reflected;
- reflected = temp;
- }
-
- }
-
- simplex.sort(sortOrder);
- return {f : simplex[0].fx,
- solution : simplex[0]};
- };
-
- /** returns a svg path of the intersection area of a bunch of circles */
- venn.intersectionAreaPath = function(circles) {
- var stats = {};
- venn.intersectionArea(circles, stats);
- var arcs = stats.arcs;
-
- if (arcs.length === 0) {
- return "M 0 0";
- }
-
- var ret = ["\nM", arcs[0].p2.x, arcs[0].p2.y];
- for (var i = 0; i < arcs.length; ++i) {
- var arc = arcs[i], r = arc.circle.radius, wide = arc.width > r;
- ret.push("\nA", r, r, 0, wide ? 1 : 0, 1, arc.p1.x, arc.p1.y);
- }
-
- return ret.join(" ");
- };
-
- // computes the center for text by sampling perimiter of circle, and taking
- // the average of points on perimeter that are only in that circle
- function computeTextCenters(sets, width, height, diagram) {
- // basically just finding the center point of each region by sampling
- // points in a grid and taking the average sampled point for each region
- // There is probably an analytic way of computing this exactly, but
- // this works well enough for our purposes
- var sums = [];
- for (var i = 0; i < sets.length; ++i) {
- sums.push({'x' : 0, 'y' : 0, 'count' : 0});
- }
-
- var samples = 32;
- for (var i = 0; i < samples; ++i) {
- var x = i * width / samples;
- for (var j = 0; j < samples; ++j) {
- var y = j * height / samples;
- var point = {'x' : x, 'y' : y};
-
- var contained = []
-
- for (var k = 0; k < sets.length; ++k) {
- if (venn.distance(point, sets[k]) <= sets[k].radius) {
- contained.push(k);
- }
- }
- if (contained.length == 1) {
- var sum = sums[contained[0]];
- sum.x += point.x;
- sum.y += point.y;
- sum.count += 1;
- }
- }
- }
-
- for (var i = 0; i < sets.length; ++i) {
- var sum = sums[i];
- if (sum.count) {
- sets[i].textCenter = { 'x' : sum.x / sum.count,
- 'y' : sum.y / sum.count};
- } else {
- // no sampled points, possibly completely overlapped (or tiny)
- // use circle centre
- sets[i].textCenter = { 'x' : sets[i].x,
- 'y' : sets[i].y};
- }
- }
- }
-
- venn.drawD3Diagram = function(element, dataset, width, height, parameters) {
- parameters = parameters || {};
-
- var colours = d3.scale.category10(),
- padding = ('padding' in parameters) ? parameters.padding : 6;
-
- dataset = venn.scaleSolution(dataset, width, height, padding);
- computeTextCenters(dataset, width, height);
-
- var svg = element.append("svg")
- .attr("width", width)
- .attr("height", height);
-
- var diagram = svg.append( "g" );
-
- var nodes = diagram.append("g").selectAll("circle")
- .data(dataset)
- .enter()
- .append("g");
-
- var circles = nodes.append("circle")
- .attr("r", function(d) { return d.radius; })
- .style("fill-opacity", 0.3)
- .attr("cx", function(d) { return d.x; })
- .attr("cy", function(d) { return d.y; })
- .style("fill", function(d, i) { return colours(i); });
-
- var text = nodes.append("text")
- .attr("dy", ".35em")
- .attr("x", function(d) { return Math.floor(d.textCenter.x); })
- .attr("y", function(d) { return Math.floor(d.textCenter.y); })
- .attr("text-anchor", "middle")
- .style("fill", function(d, i) { return colours(i); })
- .call(function (text) { text.each(wrapText); });
-
- return {'svg' : svg,
- 'nodes' : nodes,
- 'circles' : circles,
- 'text' : text };
- };
-
- venn.updateD3Diagram = function(diagram, dataset, parameters) {
- parameters = parameters || {};
- var padding = ('padding' in parameters) ? parameters.padding : 6,
- duration = ('duration' in parameters) ? parameters.duration : 400;
-
- var svg = diagram.svg,
- width = parseInt(svg.attr('width'), 10),
- height = parseInt(svg.attr('height'), 10);
-
- dataset = venn.scaleSolution(dataset, width, height, padding);
- computeTextCenters(dataset, width, height);
-
- var transition = diagram.nodes
- .data(dataset)
- .transition()
- .duration(duration);
-
- transition.select("circle")
- .attr("cx", function(d) { return d.x; })
- .attr("cy", function(d) { return d.y; })
- .attr("r", function(d) { return d.radius; });
-
- // transtitioning the text is a little tricky in the case
- // of wrapping. so lets basically transition unwrapped text
- // and at the end of the transition we'll wrap it again
- transition.select("text")
- .text(function (d) { return d.label; } )
- .each("end", wrapText)
- .attr("x", function(d) { return Math.floor(d.textCenter.x); })
- .attr("y", function(d) { return Math.floor(d.textCenter.y); })
- .style("display", function(d) { return d.radius > 0 ? "block" : "none"; } );
- };
-
- var SMALL = 1e-10;
-
- /** Returns the intersection area of a bunch of circles (where each circle
- is an object having an x,y and radius property) */
- venn.intersectionArea = function(circles, stats) {
- // get all the intersection points of the circles
- var intersectionPoints = getIntersectionPoints(circles);
-
- // filter out points that aren't included in all the circles
- var innerPoints = intersectionPoints.filter(function (p) {
- return venn.containedInCircles(p, circles);
- });
-
- var arcArea = 0, polygonArea = 0, arcs = [], i;
-
- // if we have intersection points that are within all the circles,
- // then figure out the area contained by them
- if (innerPoints.length > 1) {
- // sort the points by angle from the center of the polygon, which lets
- // us just iterate over points to get the edges
- var center = venn.getCenter(innerPoints);
- for (i = 0; i < innerPoints.length; ++i ) {
- var p = innerPoints[i];
- p.angle = Math.atan2(p.x - center.x, p.y - center.y);
- }
- innerPoints.sort(function(a,b) { return b.angle - a.angle;});
-
- // iterate over all points, get arc between the points
- // and update the areas
- var p2 = innerPoints[innerPoints.length - 1];
- for (i = 0; i < innerPoints.length; ++i) {
- var p1 = innerPoints[i];
-
- // polygon area updates easily ...
- polygonArea += (p2.x + p1.x) * (p1.y - p2.y);
-
- // updating the arc area is a little more involved
- var midPoint = {x : (p1.x + p2.x) / 2,
- y : (p1.y + p2.y) / 2},
- arc = null;
-
- for (var j = 0; j < p1.parentIndex.length; ++j) {
- if (p2.parentIndex.indexOf(p1.parentIndex[j]) > -1) {
- // figure out the angle halfway between the two points
- // on the current circle
- var circle = circles[p1.parentIndex[j]],
- a1 = Math.atan2(p1.x - circle.x, p1.y - circle.y),
- a2 = Math.atan2(p2.x - circle.x, p2.y - circle.y);
-
- var angleDiff = (a2 - a1);
- if (angleDiff < 0) {
- angleDiff += 2*Math.PI;
- }
-
- // and use that angle to figure out the width of the
- // arc
- var a = a2 - angleDiff/2,
- width = venn.distance(midPoint, {
- x : circle.x + circle.radius * Math.sin(a),
- y : circle.y + circle.radius * Math.cos(a)
- });
-
- // pick the circle whose arc has the smallest width
- if ((arc === null) || (arc.width > width)) {
- arc = { circle : circle,
- width : width,
- p1 : p1,
- p2 : p2};
- }
- }
- }
- if (arc !== null) {
- arcs.push(arc);
- arcArea += venn.circleArea(arc.circle.radius, arc.width);
- p2 = p1;
- }
- }
- } else {
- // no intersection points, is either disjoint - or is completely
- // overlapped. figure out which by examining the smallest circle
- var smallest = circles[0];
- for (i = 1; i < circles.length; ++i) {
- if (circles[i].radius < smallest.radius) {
- smallest = circles[i];
- }
- }
-
- // make sure the smallest circle is completely contained in all
- // the other circles
- var disjoint = false;
- for (i = 0; i < circles.length; ++i) {
- if (venn.distance(circles[i], smallest) > Math.abs(smallest.radius - circles[i].radius)) {
- disjoint = true;
- break;
- }
- }
-
- if (disjoint) {
- arcArea = polygonArea = 0;
-
- } else {
- arcArea = smallest.radius * smallest.radius * Math.PI;
- arcs.push({circle : smallest,
- p1: { x: smallest.x, y : smallest.y + smallest.radius},
- p2: { x: smallest.x - SMALL, y : smallest.y + smallest.radius},
- width : smallest.radius * 2 });
- }
- }
-
- polygonArea /= 2;
- if (stats) {
- stats.area = arcArea + polygonArea;
- stats.arcArea = arcArea;
- stats.polygonArea = polygonArea;
- stats.arcs = arcs;
- stats.innerPoints = innerPoints;
- stats.intersectionPoints = intersectionPoints;
- }
-
- return arcArea + polygonArea;
- };
-
- /** returns whether a point is contained by all of a list of circles */
- venn.containedInCircles = function(point, circles) {
- for (var i = 0; i < circles.length; ++i) {
- if (venn.distance(point, circles[i]) > circles[i].radius + SMALL) {
- return false;
- }
- }
- return true;
- };
-
- /** Gets all intersection points between a bunch of circles */
- function getIntersectionPoints(circles) {
- var ret = [];
- for (var i = 0; i < circles.length; ++i) {
- for (var j = i + 1; j < circles.length; ++j) {
- var intersect = venn.circleCircleIntersection(circles[i],
- circles[j]);
- for (var k = 0; k < intersect.length; ++k) {
- var p = intersect[k];
- p.parentIndex = [i,j];
- ret.push(p);
- }
- }
- }
- return ret;
- }
-
- venn.circleIntegral = function(r, x) {
- var y = Math.sqrt(r * r - x * x);
- return x * y + r * r * Math.atan2(x, y);
- };
-
- /** Returns the area of a circle of radius r - up to width */
- venn.circleArea = function(r, width) {
- return venn.circleIntegral(r, width - r) - venn.circleIntegral(r, -r);
- };
-
-
- /** euclidean distance between two points */
- venn.distance = function(p1, p2) {
- return Math.sqrt((p1.x - p2.x) * (p1.x - p2.x) +
- (p1.y - p2.y) * (p1.y - p2.y));
- };
-
-
- /** Returns the overlap area of two circles of radius r1 and r2 - that
- have their centers separated by distance d. Simpler faster
- circle intersection for only two circles */
- venn.circleOverlap = function(r1, r2, d) {
- // no overlap
- if (d >= r1 + r2) {
- return 0;
- }
-
- // completely overlapped
- if (d <= Math.abs(r1 - r2)) {
- return Math.PI * Math.min(r1, r2) * Math.min(r1, r2);
- }
-
- var w1 = r1 - (d * d - r2 * r2 + r1 * r1) / (2 * d),
- w2 = r2 - (d * d - r1 * r1 + r2 * r2) / (2 * d);
- return venn.circleArea(r1, w1) + venn.circleArea(r2, w2);
- };
-
-
- /** Given two circles (containing a x/y/radius attributes),
- returns the intersecting points if possible.
- note: doesn't handle cases where there are infinitely many
- intersection points (circles are equivalent):, or only one intersection point*/
- venn.circleCircleIntersection = function(p1, p2) {
- var d = venn.distance(p1, p2),
- r1 = p1.radius,
- r2 = p2.radius;
-
- // if to far away, or self contained - can't be done
- if ((d >= (r1 + r2)) || (d <= Math.abs(r1 - r2))) {
- return [];
- }
-
- var a = (r1 * r1 - r2 * r2 + d * d) / (2 * d),
- h = Math.sqrt(r1 * r1 - a * a),
- x0 = p1.x + a * (p2.x - p1.x) / d,
- y0 = p1.y + a * (p2.y - p1.y) / d,
- rx = -(p2.y - p1.y) * (h / d),
- ry = -(p2.x - p1.x) * (h / d);
-
- return [{ x: x0 + rx, y : y0 - ry },
- { x: x0 - rx, y : y0 + ry }];
- };
-
- /** Returns the center of a bunch of points */
- venn.getCenter = function(points) {
- var center = { x: 0, y: 0};
- for (var i =0; i < points.length; ++i ) {
- center.x += points[i].x;
- center.y += points[i].y;
- }
- center.x /= points.length;
- center.y /= points.length;
- return center;
- };
-}(window.venn = window.venn || {}));