From bb7d9365de568d976f49c60f7f63ca2918ab0589 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 13 Nov 2018 01:36:14 +0100 Subject: deploy bundle --- bundle.js | 199 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 181 insertions(+), 18 deletions(-) (limited to 'bundle.js') diff --git a/bundle.js b/bundle.js index 5aac3b1..215b3f5 100644 --- a/bundle.js +++ b/bundle.js @@ -40214,14 +40214,14 @@ function done(stream, er, data) { "use strict"; -var _slicedToArray2 = __webpack_require__(52); - -var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); - var _toArray2 = __webpack_require__(92); var _toArray3 = _interopRequireDefault(_toArray2); +var _slicedToArray2 = __webpack_require__(52); + +var _slicedToArray3 = _interopRequireDefault(_slicedToArray2); + var _tone = __webpack_require__(29); var _tone2 = _interopRequireDefault(_tone); @@ -40272,6 +40272,18 @@ var mass_fields = ["date", "timestamp", "fatalities", "injured", "total_victims" return a; }, {}); +var gv_fields = ["incident_id", "date", "state", "city_or_county", "address", "n_killed", "n_injured", "incident_url", "source_url", "incident_url_fields_missing", "congressional_district", "gun_stolen", "gun_type", "incident_characteristics", "latitude", "location_description", "longitude", "n_guns_involved", "notes", "participant_age", "participant_age_group", "participant_gender", "participant_name", "participant_relationship", "participant_status", "participant_type", "sources", "state_house_district", "state_senate_district"].reduce(function (a, b, i) { + a[b] = i; + return a; +}, {}); + +var year_days_by_month = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31, 0].reduce(function (a, b, i) { + if (i === 0) { + return [b]; + } + return a.concat(a[i - 1] + b); +}, []); + var i = 0, max_i = 0, mass_i = 0; @@ -40282,6 +40294,61 @@ var datasets = {}, var play_fn = _midi.play_sequence; data.load().then(function (lists) { console.log(lists); + 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('-'), + _l$gv_fields$date$spl2 = (0, _slicedToArray3.default)(_l$gv_fields$date$spl, 3), + y = _l$gv_fields$date$spl2[0], + m = _l$gv_fields$date$spl2[1], + d = _l$gv_fields$date$spl2[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])]; + }).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]; + }); + datasets['AR-15 2016-18'].dates.push(ar_lines.length); + datasets['AR-15 2016-18'].lines = [ar_lines.map(function (a) { + return a[1]; + })]; + 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 fm = lists.firearms_manufactured; datasets['Firearms Manufactured'] = {}; datasets['Firearms Manufactured'].name = 'Firearms Manufactured'; @@ -40309,6 +40376,7 @@ data.load().then(function (lists) { datasets["Mass Shootings"] = lists.mass_shootings_from_columbine; datasets["Mass Shootings"].name = "Mass Shootings"; datasets["Mass Shootings"].pedal = true; + datasets["Mass Shootings"].isMass = true; datasets["Mass Shootings"].play_fn = play_mass_shootings; var lines = datasets["Mass Shootings"].lines.reverse(); @@ -40362,23 +40430,26 @@ data.load().then(function (lists) { function play_mass_shootings(i, bounds, diff, note_time) { var channel = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : "all"; var exporting = arguments[5]; - var rows = bounds.rows, - min = bounds.min, + var min = bounds.min, max = bounds.max; - var y = 0; - var x = i % rows[0].length; - var n = rows[y][x]; var total = dataset.dates.length; var pedal_note = void 0; var notes = [], - midi_notes = [], - cases = [], - timings = void 0; + midi_notes = []; + var cases = []; + var timings = void 0; + var week = Math.floor((i + 8) / 4) % 4; // console.log(i, mass_i, dataset.dates[mass_i], channel, exporting) while (i >= dataset.dates[mass_i] && mass_i < total) { + // console.log(i, dataset.dates[mass_i]) notes.push(dataset.lines[0][mass_i]); - cases.push(dataset.data[mass_i][mass_fields.date] + ' ' + dataset.data[mass_i][mass_fields.case] + ", " + dataset.data[mass_i][mass_fields.fatalities] + ' dead, ' + dataset.data[mass_i][mass_fields.injured] + ' injured'); + if (dataset.isMass) { + cases.push(dataset.data[mass_i][mass_fields.date] + ' ' + dataset.data[mass_i][mass_fields.case] + ", " + dataset.data[mass_i][mass_fields.fatalities] + ' dead, ' + dataset.data[mass_i][mass_fields.injured] + ' injured'); + } else { + cases.push(dataset.labels[mass_i]); + // console.log(dataset.labels[mass_i]) + } // console.log('push case', dataset.data[mass_i][mass_fields.date] + ' ' + dataset.data[mass_i][mass_fields.case]) mass_i += 1; } @@ -40408,8 +40479,100 @@ function play_mass_shootings(i, bounds, diff, note_time) { midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 32, channel, exporting, 96)); timings = [32, 32, 32, 32]; break; + case 5: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 22, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 43)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 32, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 32, channel, exporting, 96)); + timings = [22, 21, 21, 32, 32]; + break; + case 6: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 22, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 43)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 22, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 86)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 107)); + timings = [22, 21, 21, 22, 21, 21]; + break; + case 7: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 16)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 48)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 22, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 86)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 21, channel, exporting, 107)); + timings = [16, 16, 16, 16, 22, 21, 21]; + break; + case 8: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 16)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 48)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 80)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 96)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[7], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 112)); + timings = [16, 16, 16, 16, 16, 16, 16, 16]; + break; + case 9: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 11)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 48)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 80)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[7], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 96)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[8], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 112)); + timings = [11, 11, 10, 16, 16, 16, 16, 16, 16]; + break; + case 10: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 11)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 43)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 54)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[7], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 80)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[8], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 96)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[9], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 112)); + timings = [11, 11, 10, 11, 11, 10, 16, 16, 16, 16]; + break; + case 11: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 11)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 43)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 54)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[7], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 75)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[8], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 86)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[9], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 96)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[10], min, max) * _ui.nx.multiply.value, 16, channel, exporting, 112)); + timings = [11, 11, 10, 11, 11, 10, 11, 11, 10, 16, 16]; + break; + case 12: + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[0], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 0)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[1], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 11)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[2], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 22)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[3], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 32)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[4], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 43)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[5], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 54)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[6], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 64)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[7], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 75)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[8], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 86)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[9], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 96)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[10], min, max) * _ui.nx.multiply.value, 11, channel, exporting, 107)); + midi_notes.push((0, _midi.play_note)((0, _util.norm)(notes[11], min, max) * _ui.nx.multiply.value, 10, channel, exporting, 118)); + timings = [11, 11, 10, 11, 11, 10, 11, 11, 10, 11, 11, 10]; + break; } - var pedal_freq = _scales2.default.current().index(_ui.nx.pedal_tone.value, _ui.nx.octave.value); + var pedal_freq = _scales2.default.current().index(_ui.nx.pedal_tone.value + week, _ui.nx.octave.value); pedal_note = get_midi_note_for_frequency(pedal_freq); if (!exporting) { _kalimba2.default.play(pedal_freq, -12); @@ -40441,7 +40604,7 @@ function get_midi_note_for_frequency(freq) { midi_note = Math.floor(midi_note); if (midi_note > 127) return 0; var note = _tone2.default.Frequency(Math.floor(midi_note), "midi").toNote(); - console.log(freq, midi_note, note); + // console.log(freq, midi_note, note) return note; } @@ -40460,8 +40623,8 @@ function play_next() { timings = _play_fn2[2]; if (dataset.labels) { - var j = Math.floor(i / bounds.rows[0].length); - document.querySelector('#cases').innerHTML = dataset.labels[j]; + // const j = Math.floor(i / bounds.rows[0].length) + // document.querySelector('#cases').innerHTML = dataset.labels[j] } i = new_i; @@ -44035,7 +44198,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var files = [ // "gun_violence", -"mass_shootings_from_columbine", "gun_violence_by_month", "firearms_manufactured"]; +"mass_shootings_from_columbine", "gun_violence_by_month", "firearms_manufactured", "ar_15_2016_18"]; var parse = __webpack_require__(145); var dataPromises = files.map(function (name) { -- cgit v1.2.3-70-g09d2