]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Add a CI for OOB pulls.
[pkanalytics] / ultimate.js
index 3b72f019737a0ff3b3f1e79152e371cd3269e40a..9ed8936f79d41f4d0487e82741b46e3ca75f7d2a 100644 (file)
@@ -4,7 +4,7 @@
 
 let global_json;
 
-addEventListener('hashchange', () => { console.log('heei'); process_matches(global_json); });
+addEventListener('hashchange', () => { process_matches(global_json); });
 fetch('ultimate.json')
    .then(response => response.json())
    .then(response => { global_json = response; process_matches(global_json); });
@@ -24,6 +24,9 @@ function take_off_field(player, t, live_since) {
        } else {
                attribute_player_time(player, t, live_since);
        }
+       if (player.on_field_since !== null) {  // Just a safeguard; out without in should never happen.
+               player.field_time_ms += t - player.on_field_since;
+       }
        player.on_field_since = null;
 }
 
@@ -31,6 +34,108 @@ function add_cell(tr, element_type, text) {
        let element = document.createElement(element_type);
        element.textContent = text;
        tr.appendChild(element);
+       return element;
+}
+
+function add_th(tr, text, colspan) {
+       let element = add_cell(tr, 'th', text);
+       if (colspan > 0) {
+               element.setAttribute('colspan', colspan);
+       } else {
+               element.setAttribute('colspan', '3');
+       }
+       return element;
+}
+
+function add_3cell(tr, text, cls) {
+       let p1 = add_cell(tr, 'td', '');
+       let element = add_cell(tr, 'td', text);
+       let p2 = add_cell(tr, 'td', '');
+
+       p1.classList.add('pad');
+       p2.classList.add('pad');
+       if (cls === undefined) {
+               element.classList.add('num');
+       } else {
+               element.classList.add(cls);
+       }
+       return element;
+}
+
+function add_3cell_with_filler_ci(tr, text, cls) {
+       let element = add_3cell(tr, text, cls);
+
+       let svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+       svg.classList.add('fillerci');
+       svg.setAttribute('width', ci_width);
+       svg.setAttribute('height', ci_height);
+       element.appendChild(svg);
+
+       return element;
+}
+
+function add_3cell_ci(tr, ci) {
+       if (isNaN(ci.val)) {
+               add_3cell_with_filler_ci(tr, 'N/A');
+               return;
+       }
+
+       let text;
+       if (ci.format === 'percentage') {
+               text = (100 * ci.val).toFixed(0) + '%';
+       } else {
+               text = ci.val.toFixed(2);
+       }
+       let element = add_3cell(tr, text);
+       let to_x = (val) => { return ci_width * (val - ci.min) / (ci.max - ci.min); };
+
+       // Container.
+       let svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+       if (ci.inverted === true) {
+               svg.classList.add('invertedci');
+       } else {
+               svg.classList.add('ci');
+       }
+       svg.setAttribute('width', ci_width);
+       svg.setAttribute('height', ci_height);
+
+       // The good (green) and red (bad) ranges.
+       let s0 = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+       s0.classList.add('range');
+       s0.classList.add('s0');
+       s0.setAttribute('width', to_x(ci.desired));
+       s0.setAttribute('height', ci_height);
+       s0.setAttribute('x', '0');
+
+       let s1 = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+       s1.classList.add('range');
+       s1.classList.add('s1');
+       s1.setAttribute('width', ci_width - to_x(ci.desired));
+       s1.setAttribute('height', ci_height);
+       s1.setAttribute('x', to_x(ci.desired));
+
+       // Confidence bar.
+       let bar = document.createElementNS('http://www.w3.org/2000/svg', 'rect');
+       bar.classList.add('bar');
+       bar.setAttribute('width', to_x(ci.upper_ci) - to_x(ci.lower_ci));
+       bar.setAttribute('height', ci_height / 3);
+       bar.setAttribute('x', to_x(ci.lower_ci));
+       bar.setAttribute('y', ci_height / 3);
+
+       // Marker line for average.
+       let marker = document.createElementNS('http://www.w3.org/2000/svg', 'line');
+       marker.classList.add('marker');
+       marker.setAttribute('x1', to_x(ci.val));
+       marker.setAttribute('x2', to_x(ci.val));
+       marker.setAttribute('y1', ci_height / 6);
+       marker.setAttribute('y2', ci_height * 5 / 6);
+
+       svg.appendChild(s0);
+       svg.appendChild(s1);
+       svg.appendChild(bar);
+       svg.appendChild(marker);
+
+       element.appendChild(svg);
 }
 
 function process_matches(json) {
@@ -53,6 +158,13 @@ function process_matches(json) {
                        'interceptions': 0,
                        'points_played': 0,
                        'playing_time_ms': 0,
+                       'field_time_ms': 0,
+
+                       // For efficiency.
+                       'offensive_points_completed': 0,
+                       'offensive_points_won': 0,
+                       'defensive_points_completed': 0,
+                       'defensive_points_won': 0,
 
                        'offensive_soft_plus': 0,
                        'offensive_soft_minus': 0,
@@ -69,14 +181,32 @@ function process_matches(json) {
                };
        }
 
+       // Globals.
+       players['globals'] = {
+               'points_played': 0,
+               'playing_time_ms': 0,
+               'field_time_ms': 0,
+
+               'offensive_points_completed': 0,
+               'offensive_points_won': 0,
+               'defensive_points_completed': 0,
+               'defensive_points_won': 0,
+       };
+       let globals = players['globals'];
+
        for (const match of json['matches']) {
+               let our_score = 0;
+               let their_score = 0;
                let handler = null;
                let prev_handler = null;
                let live_since = null;
                let offense = null;
                let puller = null;
                let pull_started = null;
+               let last_pull_was_ours = null;  // Effectively whether we're playing an O or D point (not affected by turnovers).
                let point_num = 0;
+               let game_started = null;
+               let last_goal = null;
                for (const [q,p] of Object.entries(players)) {
                        p.on_field_since = null;
                        p.last_point_seen = null;
@@ -96,21 +226,68 @@ function process_matches(json) {
                        // Liveness management
                        if (type === 'pull' || type === 'their_pull' || type === 'restart') {
                                live_since = t;
+                       } else if (type === 'catch' && last_pull_was_ours === null) {
+                               // Someone forgot to add the pull, so we'll need to wing it.
+                               console.log('Missing pull on ' + our_score + '\u2013' + their_score + ' in ' + match['description'] + '; pretending to have one.');
+                               live_since = t;
+                               last_pull_was_ours = !offense;
                        } else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') {
                                for (const [q,p] of Object.entries(players)) {
-                                       if (p.on_field_since !== null) {
-                                               if (p.last_point_seen !== point_num) {
-                                                       // In case the player did nothing this point,
-                                                       // not even subbing in.
-                                                       p.last_point_seen = point_num;
-                                                       ++p.points_played;
+                                       if (p.on_field_since === null) {
+                                               continue;
+                                       }
+                                       if (type !== 'stoppage' && p.last_point_seen !== point_num) {
+                                               // In case the player did nothing this point,
+                                               // not even subbing in.
+                                               p.last_point_seen = point_num;
+                                               ++p.points_played;
+                                       }
+                                       attribute_player_time(p, t, live_since);
+
+                                       if (type !== 'stoppage') {
+                                               if (last_pull_was_ours === true) {  // D point.
+                                                       ++p.defensive_points_completed;
+                                                       if (type === 'goal') {
+                                                               ++p.defensive_points_won;
+                                                       }
+                                               } else if (last_pull_was_ours === false) {  // O point.
+                                                       ++p.offensive_points_completed;
+                                                       if (type === 'goal') {
+                                                               ++p.offensive_points_won;
+                                                       }
                                                }
-                                               attribute_player_time(p, t, live_since);
                                        }
                                }
+
+                               if (type !== 'stoppage') {
+                                       // Update globals.
+                                       ++globals.points_played;
+                                       if (last_pull_was_ours === true) {  // D point.
+                                               ++globals.defensive_points_completed;
+                                               if (type === 'goal') {
+                                                       ++globals.defensive_points_won;
+                                               }
+                                       } else if (last_pull_was_ours === false) {  // O point.
+                                               ++globals.offensive_points_completed;
+                                               if (type === 'goal') {
+                                                       ++globals.offensive_points_won;
+                                               }
+                                       }
+                               }
+                               if (live_since !== null) {
+                                       globals.playing_time_ms += t - live_since;
+                               }
+
                                live_since = null;
                        }
 
+                       // Score management
+                       if (type === 'goal') {
+                               ++our_score;
+                       } else if (type === 'their_goal') {
+                               ++their_score;
+                       }
+
                        // Point count management
                        if (p !== undefined && type !== 'out' && p.last_point_seen !== point_num) {
                                p.last_point_seen = point_num;
@@ -118,6 +295,10 @@ function process_matches(json) {
                        }
                        if (type === 'goal' || type === 'their_goal') {
                                ++point_num;
+                               last_goal = t;
+                       }
+                       if (type !== 'out' && game_started === null) {
+                               game_started = t;
                        }
 
                        // Pull management
@@ -142,6 +323,25 @@ function process_matches(json) {
                        } else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
                                offense = true;
                        }
+                       if (type === 'pull') {
+                               last_pull_was_ours = true;
+                       } else if (type === 'their_pull') {
+                               last_pull_was_ours = false;
+                       } else if (type === 'set_offense' && last_pull_was_ours === null) {
+                               // set_offense could either be “changed to offense for some reason
+                               // we could not express”, or “we started in the middle of a point,
+                               // and we are offense”. We assume that if we already saw the pull,
+                               // it's the former, and if not, it's the latter; thus, the === null
+                               // test above. (It could also be “we set offense before the pull,
+                               // so that we get the right button enabled”, in which case it will
+                               // be overwritten by the next pull/their_pull event anyway.)
+                               last_pull_was_ours = false;
+                       } else if (type === 'set_defense' && last_pull_was_ours === null) {
+                               // Similar.
+                               last_pull_was_ours = true;
+                       } else if (type === 'goal' || type === 'their_goal') {
+                               last_pull_was_ours = null;
+                       }
 
                        // Event management
                        if (type === 'catch' || type === 'goal') {
@@ -183,14 +383,27 @@ function process_matches(json) {
                        } else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
                                ++p[type];
                        } else if (type !== 'in' && type !== 'out' && type !== 'pull' &&
-                                  type !== 'their_goal' && type !== 'stoppage' && type !== 'unknown' &&
+                                  type !== 'their_goal' && type !== 'stoppage' && type !== 'restart' && type !== 'unknown' &&
                                   type !== 'set_defense' && type !== 'goal' && type !== 'throwaway' &&
                                   type !== 'drop' && type !== 'set_offense' && type !== 'their_goal' &&
-                                  type !== 'pull' && type !== 'pull_landed' && type !== 'pull_oob' &&
+                                  type !== 'pull' && type !== 'pull_landed' && type !== 'pull_oob' && type !== 'their_pull' &&
                                   type !== 'their_throwaway' && type !== 'defense' && type !== 'interception') {
                                console.log("Unknown event:", e);
                        }
                }
+
+               // Add field time for all players still left at match end.
+               for (const [q,p] of Object.entries(players)) {
+                       if (p.on_field_since !== null && last_goal !== null) {
+                               p.field_time_ms += last_goal - p.on_field_since;
+                       }
+               }
+               if (game_started !== null && last_goal !== null) {
+                       globals.field_time_ms += last_goal - game_started;
+               }
+               if (live_since !== null && last_goal !== null) {
+                       globals.playing_time_ms += last_goal - live_since;
+               }
        }
 
        let chosen_category = get_chosen_category();
@@ -203,6 +416,10 @@ function process_matches(json) {
                rows = make_table_offense(players);
        } else if (chosen_category === 'defense') {
                rows = make_table_defense(players);
+       } else if (chosen_category === 'playing_time') {
+               rows = make_table_playing_time(players);
+       } else if (chosen_category === 'per_point') {
+               rows = make_table_per_point(players);
        }
        document.getElementById('stats').replaceChildren(...rows);
 }
@@ -212,6 +429,10 @@ function get_chosen_category() {
                return 'offense';
        } else if (window.location.hash === '#defense') {
                return 'defense';
+       } else if (window.location.hash === '#playing_time') {
+               return 'playing_time';
+       } else if (window.location.hash === '#per_point') {
+               return 'per_point';
        } else {
                return 'general';
        }
@@ -220,7 +441,9 @@ function get_chosen_category() {
 function write_main_menu(chosen_category) {
        let elems = [];
        if (chosen_category === 'general') {
-               elems.push(document.createTextNode('General'));
+               let span = document.createElement('span');
+               span.innerText = 'General';
+               elems.push(span);
        } else {
                let a = document.createElement('a');
                a.appendChild(document.createTextNode('General'));
@@ -228,9 +451,10 @@ function write_main_menu(chosen_category) {
                elems.push(a);
        }
 
-       elems.push(document.createTextNode(' | '));
        if (chosen_category === 'offense') {
-               elems.push(document.createTextNode('Offense'));
+               let span = document.createElement('span');
+               span.innerText = 'Offense';
+               elems.push(span);
        } else {
                let a = document.createElement('a');
                a.appendChild(document.createTextNode('Offense'));
@@ -238,9 +462,10 @@ function write_main_menu(chosen_category) {
                elems.push(a);
        }
 
-       elems.push(document.createTextNode(' | '));
        if (chosen_category === 'defense') {
-               elems.push(document.createTextNode('Defense'));
+               let span = document.createElement('span');
+               span.innerText = 'Defense';
+               elems.push(span);
        } else {
                let a = document.createElement('a');
                a.appendChild(document.createTextNode('Defense'));
@@ -248,33 +473,138 @@ function write_main_menu(chosen_category) {
                elems.push(a);
        }
 
+       if (chosen_category === 'playing_time') {
+               let span = document.createElement('span');
+               span.innerText = 'Playing time';
+               elems.push(span);
+       } else {
+               let a = document.createElement('a');
+               a.appendChild(document.createTextNode('Playing time'));
+               a.setAttribute('href', '#playing_time');
+               elems.push(a);
+       }
+
+       if (chosen_category === 'per_point') {
+               let span = document.createElement('span');
+               span.innerText = 'Per point';
+               elems.push(span);
+       } else {
+               let a = document.createElement('a');
+               a.appendChild(document.createTextNode('Per point'));
+               a.setAttribute('href', '#per_point');
+               elems.push(a);
+       }
+
        document.getElementById('mainmenu').replaceChildren(...elems);
 }
 
+// https://en.wikipedia.org/wiki/1.96#History
+const z = 1.959964;
+
+const ci_width = 100;
+const ci_height = 20;
+
+function make_binomial_ci(val, num, z) {
+       let avg = val / num;
+
+       // https://en.wikipedia.org/wiki/Binomial_proportion_confidence_interval#Wilson_score_interval
+       let low  = (avg + z*z/(2*num) - z * Math.sqrt(avg * (1.0 - avg) / num + z*z/(4*num*num))) / (1 + z*z/num);   
+       let high = (avg + z*z/(2*num) + z * Math.sqrt(avg * (1.0 - avg) / num + z*z/(4*num*num))) / (1 + z*z/num); 
+
+       // Fix the signs so that we don't get -0.00.
+       low = Math.max(low, 0.0);
+       return {
+               'val': avg,
+               'lower_ci': low,
+               'upper_ci': high,
+               'min': 0.0,
+               'max': 1.0,
+       };
+}
+
+// These can only happen once per point, but you get -1 and +1
+// instead of 0 and +1. After we rewrite to 0 and 1, it's a binomial,
+// and then we can rewrite back.
+function make_efficiency_ci(points_won, points_completed, z)
+{
+       let ci = make_binomial_ci(points_won, points_completed, z);
+       ci.val = 2.0 * ci.val - 1.0;
+       ci.lower_ci = 2.0 * ci.lower_ci - 1.0;
+       ci.upper_ci = 2.0 * ci.upper_ci - 1.0;
+       ci.min = -1.0;
+       ci.max = 1.0;
+       ci.desired = 0.0;  // Desired = positive efficiency.
+       return ci;
+}
+
+// Ds, throwaways and drops can happen multiple times per point,
+// so they are Poisson distributed.
+//
+// Modified Wald (recommended by http://www.ine.pt/revstat/pdf/rs120203.pdf
+// since our rates are definitely below 2 per point).
+function make_poisson_ci(val, num, z, inverted)
+{
+       let low  = (val == 0) ? 0.0 : ((val - 0.5) - Math.sqrt(val - 0.5)) / num;
+       let high = (val == 0) ? -Math.log(0.025) / num : ((val + 0.5) + Math.sqrt(val + 0.5)) / num;
+
+       // Fix the signs so that we don't get -0.00.
+       low = Math.max(low, 0.0);
+
+       // The display range of 0 to 0.25 is fairly arbitrary. So is the desired 0.05 per point.
+       let avg = val / num;
+       return {
+               'val': avg,
+               'lower_ci': low,
+               'upper_ci': high,
+               'min': 0.0,
+               'max': 0.25,
+               'desired': 0.05,
+               'inverted': inverted,
+       };
+}
+
 function make_table_general(players) {
        let rows = [];
        {
                let header = document.createElement('tr');
-               add_cell(header, 'th', 'Player');
-               add_cell(header, 'th', '+/-');
-               add_cell(header, 'th', 'Soft +/-');
-               add_cell(header, 'th', 'Points played');
-               add_cell(header, 'th', 'Time played');
+               add_th(header, 'Player');
+               add_th(header, '+/-');
+               add_th(header, 'Soft +/-');
+               add_th(header, 'O efficiency');
+               add_th(header, 'D efficiency');
+               add_th(header, 'Points played');
                rows.push(header);
        }
 
        for (const [q,p] of Object.entries(players)) {
+               if (q === 'globals') continue;
                let row = document.createElement('tr');
                let pm = p.goals + p.assists + p.hockey_assists + p.defenses - p.throwaways - p.drops;
                let soft_pm = p.offensive_soft_plus + p.defensive_soft_plus - p.offensive_soft_minus - p.defensive_soft_minus;
-               add_cell(row, 'td', p.name);  // TODO: number?
-               add_cell(row, 'td', pm > 0 ? ('+' + pm) : pm);
-               add_cell(row, 'td', soft_pm > 0 ? ('+' + soft_pm) : soft_pm);
-               add_cell(row, 'td', p.points_played);
-               add_cell(row, 'td', Math.floor(p.playing_time_ms / 60000) + ' min');
+               let o_efficiency = make_efficiency_ci(p.offensive_points_won, p.offensive_points_completed, z);
+               let d_efficiency = make_efficiency_ci(p.defensive_points_won, p.defensive_points_completed, z);
+               add_3cell(row, p.name, 'name');  // TODO: number?
+               add_3cell(row, pm > 0 ? ('+' + pm) : pm);
+               add_3cell(row, soft_pm > 0 ? ('+' + soft_pm) : soft_pm);
+               add_3cell_ci(row, o_efficiency);
+               add_3cell_ci(row, d_efficiency);
+               add_3cell(row, p.points_played);
                rows.push(row);
-               console.log(p.name + " played " + p.points_played + " points (" + Math.floor(p.playing_time_ms / 60000) + " min), " + p.goals + " goals, " + p.assists + " assists, plus/minus: " + pm);
        }
+
+       // Globals.
+       let globals = players['globals'];
+       let o_efficiency = make_efficiency_ci(globals.offensive_points_won, globals.offensive_points_completed, z);
+       let d_efficiency = make_efficiency_ci(globals.defensive_points_won, globals.defensive_points_completed, z);
+       let row = document.createElement('tr');
+       add_3cell(row, '');
+       add_3cell(row, '');
+       add_3cell(row, '');
+       add_3cell_ci(row, o_efficiency);
+       add_3cell_ci(row, d_efficiency);
+       add_3cell(row, globals.points_played);
+       rows.push(row);
+
        return rows;
 }
 
@@ -282,39 +612,80 @@ function make_table_offense(players) {
        let rows = [];
        {
                let header = document.createElement('tr');
-               add_cell(header, 'th', 'Player');
-               add_cell(header, 'th', 'Goals');
-               add_cell(header, 'th', 'Assists');
-               add_cell(header, 'th', 'Hockey assists');
-               add_cell(header, 'th', 'Throws');
-               add_cell(header, 'th', 'Throwaways');
-               add_cell(header, 'th', '%OK');
-               add_cell(header, 'th', 'Catches');
-               add_cell(header, 'th', 'Drops');
-               add_cell(header, 'th', '%OK');
-               add_cell(header, 'th', 'Soft +/-');
+               add_th(header, 'Player');
+               add_th(header, 'Goals');
+               add_th(header, 'Assists');
+               add_th(header, 'Hockey assists');
+               add_th(header, 'Throws');
+               add_th(header, 'Throwaways');
+               add_th(header, '%OK');
+               add_th(header, 'Catches');
+               add_th(header, 'Drops');
+               add_th(header, '%OK');
+               add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
 
+       let num_throws = 0;
+       let throwaways = 0;
+       let catches = 0;
+       let drops = 0;
        for (const [q,p] of Object.entries(players)) {
-               let throw_ok = 100 * (1 - p.throwaways / p.num_throws);
-               let catch_ok = 100 * (p.catches / (p.catches + p.drops));
+               if (q === 'globals') continue;
+               let throw_ok = make_binomial_ci(p.num_throws - p.throwaways, p.num_throws, z);
+               let catch_ok = make_binomial_ci(p.catches, p.catches + p.drops, z);
+
+               throw_ok.format = 'percentage';
+               catch_ok.format = 'percentage';
+
+               // Desire at least 90% percentage. Fairly arbitrary.
+               throw_ok.desired = 0.9;
+               catch_ok.desired = 0.9;
 
                let row = document.createElement('tr');
-               add_cell(row, 'td', p.name);  // TODO: number?
-               add_cell(row, 'td', p.goals);
-               add_cell(row, 'td', p.assists);
-               add_cell(row, 'td', p.hockey_assists);
-               add_cell(row, 'td', p.num_throws);
-               add_cell(row, 'td', p.throwaways);
-               add_cell(row, 'td', throw_ok.toFixed(0) + '%');
-               add_cell(row, 'td', p.catches);
-               add_cell(row, 'td', p.drops);
-               add_cell(row, 'td', catch_ok.toFixed(0) + '%');
-               add_cell(row, 'td', '+' + p.offensive_soft_plus);
-               add_cell(row, 'td', '-' + p.offensive_soft_minus);
+               add_3cell(row, p.name, 'name');  // TODO: number?
+               add_3cell(row, p.goals);
+               add_3cell(row, p.assists);
+               add_3cell(row, p.hockey_assists);
+               add_3cell(row, p.num_throws);
+               add_3cell(row, p.throwaways);
+               add_3cell_ci(row, throw_ok);
+               add_3cell(row, p.catches);
+               add_3cell(row, p.drops);
+               add_3cell_ci(row, catch_ok);
+               add_3cell(row, '+' + p.offensive_soft_plus);
+               add_3cell(row, '-' + p.offensive_soft_minus);
                rows.push(row);
+
+               num_throws += p.num_throws;
+               throwaways += p.throwaways;
+               catches += p.catches;
+               drops += p.drops;
        }
+
+       // Globals.
+       let throw_ok = make_binomial_ci(num_throws - throwaways, num_throws, z);
+       let catch_ok = make_binomial_ci(catches, catches + drops, z);
+       throw_ok.format = 'percentage';
+       catch_ok.format = 'percentage';
+       throw_ok.desired = 0.9;
+       catch_ok.desired = 0.9;
+
+       let row = document.createElement('tr');
+       add_3cell(row, '');
+       add_3cell(row, '');
+       add_3cell(row, '');
+       add_3cell(row, '');
+       add_3cell(row, num_throws);
+       add_3cell(row, throwaways);
+       add_3cell_ci(row, throw_ok);
+       add_3cell(row, catches);
+       add_3cell(row, drops);
+       add_3cell_ci(row, catch_ok);
+       add_3cell(row, '');
+       add_3cell(row, '');
+       rows.push(row);
+
        return rows;
 }
 
@@ -322,15 +693,17 @@ function make_table_defense(players) {
        let rows = [];
        {
                let header = document.createElement('tr');
-               add_cell(header, 'th', 'Player');
-               add_cell(header, 'th', 'Ds');
-               add_cell(header, 'th', 'Pulls');
-               add_cell(header, 'th', 'OOB pulls');
-               add_cell(header, 'th', 'Avg. hang time (IB)');
-               add_cell(header, 'th', 'Soft +/-');
+               add_th(header, 'Player');
+               add_th(header, 'Ds');
+               add_th(header, 'Pulls');
+               add_th(header, 'OOB pulls');
+               add_th(header, 'OOB%');
+               add_th(header, 'Avg. hang time (IB)');
+               add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
        for (const [q,p] of Object.entries(players)) {
+               if (q === 'globals') continue;
                let sum_time = 0;
                for (const t of p.pull_times) {
                        sum_time += t;
@@ -338,23 +711,148 @@ function make_table_defense(players) {
                let avg_time = 1e-3 * sum_time / p.pulls;
                let oob_pct = 100 * p.oob_pulls / p.pulls;
 
+               let ci_oob = make_binomial_ci(p.oob_pulls, p.pulls, z);
+               ci_oob.format = 'percentage';
+               ci_oob.desired = 0.2;  // Arbitrary.
+               ci_oob.inverted = true;
+
                let row = document.createElement('tr');
-               add_cell(row, 'td', p.name);  // TODO: number?
-               add_cell(row, 'td', p.defenses);
-               add_cell(row, 'td', p.pulls);
-               if (p.pulls === 0) {
-                       add_cell(row, 'td', 'N/A');
+               add_3cell(row, p.name, 'name');  // TODO: number?
+               add_3cell(row, p.defenses);
+               add_3cell(row, p.pulls);
+               add_3cell(row, p.oob_pulls);
+               add_3cell_ci(row, ci_oob);
+               if (p.pulls > p.oob_pulls) {
+                       add_3cell(row, avg_time.toFixed(1) + ' sec');
                } else {
-                       add_cell(row, 'td', p.oob_pulls + ' (' + oob_pct.toFixed(0) + '%)');
+                       add_3cell(row, 'N/A');
                }
-               if (p.pulls > p.oob_pulls) {
-                       add_cell(row, 'td', avg_time.toFixed(1) + ' sec');
+               add_3cell(row, '+' + p.defensive_soft_plus);
+               add_3cell(row, '-' + p.defensive_soft_minus);
+               rows.push(row);
+       }
+       return rows;
+}
+
+function make_table_playing_time(players) {
+       let rows = [];
+       {
+               let header = document.createElement('tr');
+               add_th(header, 'Player');
+               add_th(header, 'Points played');
+               add_th(header, 'Time played');
+               add_th(header, 'Time on field');
+               add_th(header, 'O points');
+               add_th(header, 'D points');
+               rows.push(header);
+       }
+
+       for (const [q,p] of Object.entries(players)) {
+               if (q === 'globals') continue;
+               let row = document.createElement('tr');
+               add_3cell(row, p.name, 'name');  // TODO: number?
+               add_3cell(row, p.points_played);
+               add_3cell(row, Math.floor(p.playing_time_ms / 60000) + ' min');
+               add_3cell(row, Math.floor(p.field_time_ms / 60000) + ' min');
+               add_3cell(row, p.offensive_points_completed);
+               add_3cell(row, p.defensive_points_completed);
+               rows.push(row);
+       }
+
+       // Globals.
+       let globals = players['globals'];
+       let row = document.createElement('tr');
+       add_3cell(row, '');
+       add_3cell(row, globals.points_played);
+       add_3cell(row, Math.floor(globals.playing_time_ms / 60000) + ' min');
+       add_3cell(row, Math.floor(globals.field_time_ms / 60000) + ' min');
+       add_3cell(row, globals.offensive_points_completed);
+       add_3cell(row, globals.defensive_points_completed);
+       rows.push(row);
+
+       return rows;
+}
+
+function make_table_per_point(players) {
+       let rows = [];
+       {
+               let header = document.createElement('tr');
+               add_th(header, 'Player');
+               add_th(header, 'Goals');
+               add_th(header, 'Assists');
+               add_th(header, 'Hockey assists');
+               add_th(header, 'Ds');
+               add_th(header, 'Throwaways');
+               add_th(header, 'Drops');
+               add_th(header, 'Touches');
+               rows.push(header);
+       }
+
+       let goals = 0;
+       let assists = 0;
+       let hockey_assists = 0;
+       let defenses = 0;
+       let throwaways = 0;
+       let drops = 0;
+       let touches = 0;
+       for (const [q,p] of Object.entries(players)) {
+               if (q === 'globals') continue;
+
+               // Can only happen once per point, so these are binomials.
+               let ci_goals = make_binomial_ci(p.goals, p.points_played, z);
+               let ci_assists = make_binomial_ci(p.assists, p.points_played, z);
+               let ci_hockey_assists = make_binomial_ci(p.hockey_assists, p.points_played, z);
+               // Arbitrarily desire at least 10% (not everybody can score or assist).
+               ci_goals.desired = 0.1;
+               ci_assists.desired = 0.1;
+               ci_hockey_assists.desired = 0.1;
+
+               let row = document.createElement('tr');
+               add_3cell(row, p.name, 'name');  // TODO: number?
+               add_3cell_ci(row, ci_goals);
+               add_3cell_ci(row, ci_assists);
+               add_3cell_ci(row, ci_hockey_assists);
+               add_3cell_ci(row, make_poisson_ci(p.defenses, p.points_played, z));
+               add_3cell_ci(row, make_poisson_ci(p.throwaways, p.points_played, z, true));
+               add_3cell_ci(row, make_poisson_ci(p.drops, p.points_played, z, true));
+               if (p.points_played > 0) {
+                       add_3cell(row, p.touches == 0 ? 0 : (p.touches / p.points_played).toFixed(2));
                } else {
-                       add_cell(row, 'td', 'N/A');
+                       add_3cell(row, 'N/A');
                }
-               add_cell(row, 'td', '+' + p.defensive_soft_plus);
-               add_cell(row, 'td', '-' + p.defensive_soft_minus);
                rows.push(row);
+
+               goals += p.goals;
+               assists += p.assists;
+               hockey_assists += p.hockey_assists;
+               defenses += p.defenses;
+               throwaways += p.throwaways;
+               drops += p.drops;
+               touches += p.touches;
        }
+
+       // Globals.
+       let globals = players['globals'];
+       let row = document.createElement('tr');
+       add_3cell(row, '');
+       if (globals.points_played > 0) {
+               add_3cell_with_filler_ci(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
+               add_3cell_with_filler_ci(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
+               add_3cell_with_filler_ci(row, hockey_assists == 0 ? 0 : (hockey_assists / globals.points_played).toFixed(2));
+               add_3cell_with_filler_ci(row, defenses == 0 ? 0 : (defenses / globals.points_played).toFixed(2));
+               add_3cell_with_filler_ci(row, throwaways == 0 ? 0 : (throwaways / globals.points_played).toFixed(2));
+               add_3cell_with_filler_ci(row, drops == 0 ? 0 : (drops / globals.points_played).toFixed(2));
+               add_3cell(row, touches == 0 ? 0 : (touches / globals.points_played).toFixed(2));
+       } else {
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell_with_filler_ci(row, 'N/A');
+               add_3cell(row, 'N/A');
+       }
+       rows.push(row);
+
        return rows;
 }