diff options
Diffstat (limited to 'bundle.js')
| -rw-r--r-- | bundle.js | 130 |
1 files changed, 111 insertions, 19 deletions
@@ -40222,6 +40222,10 @@ var _slicedToArray2 = __webpack_require__(62); var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); +var _log = __webpack_require__(158); + +var _log2 = _interopRequireDefault(_log); + var _tone = __webpack_require__(29); var _tone2 = _interopRequireDefault(_tone); @@ -40294,21 +40298,45 @@ var datasets = {}, var play_fn = _midi.play_sequence; data.load().then(function (lists) { console.log(lists); + + var fmedia = lists.media; + var mediaLines = []; + for (var i = 0; i < fmedia.lines.length; i++) { + mediaLines.push(fmedia.lines[i]); + // if ((i % 7) == 6) { + // mediaLines.push([i, 0, 0]) + // } + } + datasets['Media'] = {}; + datasets['Media'].name = 'Media after Parkland'; + datasets['Media'].play_fn = _midi.play_sequence; + datasets['Media'].h = fmedia.h.slice(1, 5); + datasets['Media'].labels = mediaLines.map(function (l) { + return l.slice(0, 1).map(function (n) { + return (n / 7).toFixed(1); + }); + }); + datasets['Media'].lines = mediaLines.map(function (l) { + return l.slice(1, 3).map(function (n) { + return (0, _log2.default)(n + 1); + }); + }); + datasets['Media'].onPick = function () { + _ui.nx.offset.value = -6; + _ui.nx.multiply.value = 20; + document.querySelector('#scale').value = '0'; + _scales2.default.pick(0); + }; + var ar15 = lists.ar_15_2016_18; datasets['AR-15 2016-18'] = {}; datasets['AR-15 2016-18'].name = 'AR-15 (2016-18)'; datasets['AR-15 2016-18'].pedal = true; datasets['AR-15 2016-18'].play_fn = play_mass_shootings; - // datasets['AR-15 2016-18'].lines = ar15.lines.map(l => { - var ar_lines = ar15.lines.map(function (l) { if (l[gv_fields.incident_characteristics].match('Shots Fired - No Injuries')) { return null; } - // console.log(l[gv_fields.n_killed], l[gv_fields.n_injured]) - // if (l[gv_fields.n_killed] < 1) return null - // if (l[gv_fields.n_killed] < 2 && l[gv_fields.n_injured] < 2) return null - // return [l[gv_fields.n_killed], l[gv_fields.n_injured]].map(n => Math.log(Math.log(n+1)+1)) if (l[gv_fields.n_killed] + l[gv_fields.n_injured] < 4) return null; var _l$gv_fields$date$spl = l[gv_fields.date].split('-'), @@ -40322,7 +40350,7 @@ data.load().then(function (lists) { var mm = year_days_by_month[parseInt(m)]; var dd = Math.floor(parseInt(d)) + 14; var date = Math.floor((yy + mm + dd) / 7); - console.log(date, y, m, d); + // console.log(date, y, m, d) var total = l[gv_fields.n_killed] + l[gv_fields.n_injured]; if (l[gv_fields.n_killed] === 0) { total = -l[gv_fields.n_injured]; @@ -40331,10 +40359,6 @@ data.load().then(function (lists) { }).filter(function (n) { return !!n; }); - - // console.log(a) - // console.log(ar_lines) - // datasets['AR-15 2016-18'].data = datasets['AR-15 2016-18'].dates = ar_lines.map(function (a) { return a[0]; }); @@ -40345,9 +40369,48 @@ data.load().then(function (lists) { datasets['AR-15 2016-18'].labels = ar_lines.map(function (a) { return a[2]; }); - // datasets['AR-15 2016-18'].max_i = 3 * 12 + 4 - console.log(ar_lines.length); + var schools = lists.school_shootings; + datasets['School Shootings 2016-18'] = {}; + datasets['School Shootings 2016-18'].name = 'School Shootings (2016-18)'; + datasets['School Shootings 2016-18'].pedal = true; + datasets['School Shootings 2016-18'].play_fn = play_mass_shootings; + var school_lines = schools.lines.map(function (l) { + if (l[gv_fields.incident_characteristics].match('Shots Fired - No Injuries')) { + return null; + } + if (l[gv_fields.n_killed] + l[gv_fields.n_injured] < 4) return null; + + var _l$gv_fields$date$spl3 = l[gv_fields.date].split('-'), + _l$gv_fields$date$spl4 = (0, _slicedToArray3.default)(_l$gv_fields$date$spl3, 3), + y = _l$gv_fields$date$spl4[0], + m = _l$gv_fields$date$spl4[1], + d = _l$gv_fields$date$spl4[2]; + + if (parseInt(y) > 2017) return null; + var yy = (parseInt(y) - 2016) * 365; + var mm = year_days_by_month[parseInt(m)]; + var dd = Math.floor(parseInt(d)) + 14; + var date = Math.floor((yy + mm + dd) / 7); + // console.log(date, y, m, d) + var total = l[gv_fields.n_killed] + l[gv_fields.n_injured]; + if (l[gv_fields.n_killed] === 0) { + total = -l[gv_fields.n_injured]; + } + return [date, Math.log(Math.log(total + 10) + 1), "** !!, $$, {} killed, [] injured".replace('**', l[gv_fields.date]).replace('!!', l[gv_fields.city_or_county]).replace('$$', l[gv_fields.state]).replace('{}', l[gv_fields.n_killed]).replace('[]', l[gv_fields.n_injured]), l[gv_fields.n_killed], l[gv_fields.n_injured]]; + }).filter(function (n) { + return !!n; + }); + datasets['School Shootings 2016-18'].dates = school_lines.map(function (a) { + return a[0]; + }); + datasets['School Shootings 2016-18'].dates.push(school_lines.length); + datasets['School Shootings 2016-18'].lines = [school_lines.map(function (a) { + return a[1]; + })]; + datasets['School Shootings 2016-18'].labels = school_lines.map(function (a) { + return a[2]; + }); var fm = lists.firearms_manufactured; datasets['Firearms Manufactured'] = {}; @@ -40657,6 +40720,9 @@ function pick_dataset(key) { diff = (0, _util.get_diff_bounds)(bounds.rows); play_fn = dataset.play_fn; max_i = dataset.max_i || bounds.rows.length * bounds.rows[0].length; + if (dataset.onPick) { + dataset.onPick(); + } } /* build and bind the UI */ @@ -40775,13 +40841,13 @@ function ready() { document.querySelector('.loading').classList.remove('loading'); + document.querySelector('#scale').value = '14'; + _scales2.default.pick(14); + var initial_dataset = decodeURIComponent(window.location.hash.substr(1)) || 'Mass Shootings'; document.querySelector('#dataset').value = initial_dataset; pick_dataset(initial_dataset); - document.querySelector('#scale').value = '14'; - _scales2.default.pick(14); - // play_next() } @@ -41172,7 +41238,7 @@ module.exports = function () { var Intonation = function Intonation(opt) { opt = this.opt = (0, _assign2.default)({ name: "", - root: 440, + root: 466.164, octave: 0, interval: 2, tet: 0, @@ -42170,7 +42236,7 @@ function play_note(index, duration) { if (exporting) { return note; } - console.log('defer', defer, defer_time); + // console.log('defer', defer, defer_time) if (midiDevice) { duration = duration || 60000 / _tone2.default.Transport.bpm.value; if (!exporting) { @@ -44198,7 +44264,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var files = [ // "gun_violence", -"mass_shootings_from_columbine", "gun_violence_by_month", "firearms_manufactured", "ar_15_2016_18"]; +"mass_shootings_from_columbine", "gun_violence_by_month", "firearms_manufactured", "ar_15_2016_18", "media"]; var parse = __webpack_require__(145); var dataPromises = files.map(function (name) { @@ -46611,6 +46677,32 @@ module.exports = function isBuffer(arg) { && typeof arg.readUInt8 === 'function'; } +/***/ }), +/* 158 */ +/***/ (function(module, exports, __webpack_require__) { + +module.exports = { "default": __webpack_require__(159), __esModule: true }; + +/***/ }), +/* 159 */ +/***/ (function(module, exports, __webpack_require__) { + +__webpack_require__(160); +module.exports = __webpack_require__(0).Math.log10; + +/***/ }), +/* 160 */ +/***/ (function(module, exports, __webpack_require__) { + +// 20.2.2.21 Math.log10(x) +var $export = __webpack_require__(6); + +$export($export.S, 'Math', { + log10: function log10(x){ + return Math.log(x) / Math.LN10; + } +}); + /***/ }) /******/ ]); //# sourceMappingURL=bundle.js.map
\ No newline at end of file |