]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Reduce reliance on global_filters, to prepare for multiple filtersets.
[pkanalytics] / ultimate.js
index 0655b2fb79a4b7c27796eb04490b37eb96b432e9..907023aedc09cc18cc21a6bc0a1297b11cfa6c64 100644 (file)
@@ -11,6 +11,17 @@ fetch('ultimate.json')
    .then(response => response.json())
    .then(response => { global_json = response; process_matches(global_json, global_filters); });
 
+function format_time(t)
+{
+       const ms = t % 1000 + '';
+       t = Math.floor(t / 1000);
+       const sec = t % 60 + '';
+       t = Math.floor(t / 60);
+       const min = t % 60 + '';
+       const hour = Math.floor(t / 60) + '';
+       return hour + ':' + min.padStart(2, '0') + ':' + sec.padStart(2, '0') + '.' + ms.padStart(3, '0');
+}
+
 function attribute_player_time(player, to, from, offense) {
        let delta_time;
        if (player.on_field_since > from) {
@@ -49,7 +60,17 @@ function add_cell(tr, element_type, text) {
 }
 
 function add_th(tr, text, colspan) {
-       let element = add_cell(tr, 'th', text);
+       let element = document.createElement('th');
+       let link = document.createElement('a');
+       link.style.cursor = 'pointer';
+       link.addEventListener('click', (e) => {
+               sort_by(element);
+               process_matches(global_json, global_filters);
+       });
+       link.textContent = text;
+       element.appendChild(link);
+       tr.appendChild(element);
+
        if (colspan > 0) {
                element.setAttribute('colspan', colspan);
        } else {
@@ -154,6 +175,7 @@ function process_matches(json, filters) {
        for (const player of json['players']) {
                players[player['player_id']] = {
                        'name': player['name'],
+                       'gender': player['gender'],
                        'number': player['number'],
 
                        'goals': 0,
@@ -164,9 +186,11 @@ function process_matches(json, filters) {
                        'num_throws': 0,
                        'throwaways': 0,
                        'drops': 0,
+                       'was_ds': 0,
+                       'stallouts': 0,
 
                        'defenses': 0,
-                       'interceptions': 0,
+                       'callahans': 0,
                        'points_played': 0,
                        'playing_time_ms': 0,
                        'offensive_playing_time_ms': 0,
@@ -217,6 +241,7 @@ function process_matches(json, filters) {
                let our_score = 0;
                let their_score = 0;
                let handler = null;
+               let handler_got_by_interception = false;  // Only relevant if handler !== null.
                let prev_handler = null;
                let live_since = null;
                let offense = null;  // True/false/null (unknown).
@@ -251,10 +276,10 @@ function process_matches(json, filters) {
                        let p = players[e['player']];
 
                        // Sub management
-                       let keep = keep_event(players, formations_used_this_point, filters);
+                       let keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
                        if (type === 'in' && p.on_field_since === null) {
                                p.on_field_since = t;
-                               if (!keep && keep_event(players, formations_used_this_point, filters)) {
+                               if (!keep && keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
                                        // A player needed for the filters went onto the field,
                                        // so pretend people walked on right now (to start their
                                        // counting time).
@@ -266,7 +291,7 @@ function process_matches(json, filters) {
                                }
                        } else if (type === 'out') {
                                take_off_field(p, t, live_since, offense, keep);
-                               if (keep && !keep_event(players, formations_used_this_point, filters)) {
+                               if (keep && !keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
                                        // A player needed for the filters went off the field,
                                        // so we need to attribute time for all the others.
                                        // Pretend they walked off and then immediately on again.
@@ -281,14 +306,14 @@ function process_matches(json, filters) {
                                }
                        }
 
-                       keep = keep_event(players, formations_used_this_point, filters);  // Recompute after in/out.
+                       keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);  // Recompute after in/out.
 
                        // 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.');
+                               console.log(match['description'] + ' ' + format_time(t) + ': Missing pull on ' + our_score + '\u2013' + their_score + '; pretending to have one.');
                                live_since = t;
                                last_pull_was_ours = !offense;
                        } else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') {
@@ -392,7 +417,7 @@ function process_matches(json, filters) {
 
                        // Offense/defense management
                        let last_offense = offense;
-                       if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop') {
+                       if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop' || type === 'was_d' || type === 'stallout') {
                                offense = false;
                        } else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
                                offense = true;
@@ -471,8 +496,29 @@ function process_matches(json, filters) {
                                }
                        }
 
+                       if (type !== 'out' && type !== 'in' && p !== undefined && p.on_field_since === null) {
+                               console.log(match['description'] + ' ' + format_time(t) + ': Event “' + type + '” on subbed-out player ' + p.name);
+                       }
+                       if (type === 'catch' && handler !== null && players[handler].on_field_since === null) {
+                               // The handler subbed out and was replaced with another handler,
+                               // so this wasn't a pass.
+                               handler = null;
+                       }
+
                        // Event management
-                       if (type === 'catch' || type === 'goal') {
+                       if (type === 'goal' && handler === e['player'] && handler_got_by_interception) {
+                               // Self-pass to goal after an interception; this is not a real pass,
+                               // just how we represent a Callahan right now -- so don't
+                               // count the throw, any assists or similar.
+                               //
+                               // It's an open question how we should handle a self-pass that is
+                               // _not_ after an interception, or a self-pass that's not a goal.
+                               // (It must mean we tipped off someone.) We'll count it as a regular one
+                               // for the time being, although it will make hockey assists weird.
+                               ++p.goals;
+                               ++p.callahans;
+                               handler = prev_handler = null;
+                       } else if (type === 'catch' || type === 'goal') {
                                if (handler !== null) {
                                        if (keep) {
                                                ++players[handler].num_throws;
@@ -496,6 +542,7 @@ function process_matches(json, filters) {
                                        // Update hold history.
                                        prev_handler = handler;
                                        handler = e['player'];
+                                       handler_got_by_interception = false;
                                }
                        } else if (type === 'throwaway') {
                                if (keep) {
@@ -506,26 +553,33 @@ function process_matches(json, filters) {
                        } else if (type === 'drop') {
                                if (keep) ++p.drops;
                                handler = prev_handler = null;
+                       } else if (type === 'stallout') {
+                               if (keep) ++p.stallouts;
+                               handler = prev_handler = null;
+                       } else if (type === 'was_d') {
+                               if (keep) ++p.was_ds;
+                               handler = prev_handler = null;
                        } else if (type === 'defense') {
                                if (keep) ++p.defenses;
                        } else if (type === 'interception') {
                                if (keep) {
-                                       ++p.interceptions;
+                                       ++p.catches;
                                        ++p.defenses;
                                        ++p.touches;
                                }
                                prev_handler = null;
                                handler = e['player'];
+                               handler_got_by_interception = true;
                        } else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
                                if (keep) ++p[type];
                        } else if (type !== 'in' && type !== 'out' && type !== 'pull' &&
                                   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 !== 'drop' && type !== 'was_d' && type !== 'stallout' && type !== 'set_offense' && type !== 'their_goal' &&
                                   type !== 'pull' && type !== 'pull_landed' && type !== 'pull_oob' && type !== 'their_pull' &&
                                   type !== 'their_throwaway' && type !== 'defense' && type !== 'interception' &&
                                   type !== 'formation_offense' && type !== 'formation_defense') {
-                               console.log("Unknown event:", e);
+                               console.log(format_time(t) + ": Unknown event “" + e + "”");
                        }
 
                        if (type === 'goal' || type === 'their_goal') {
@@ -534,7 +588,7 @@ function process_matches(json, filters) {
                }
 
                // Add field time for all players still left at match end.
-               const keep = keep_event(players, formations_used_this_point, filters);
+               const keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
                if (keep) {
                        for (const [q,p] of Object.entries(players)) {
                                if (p.on_field_since !== null && last_goal !== null) {
@@ -725,19 +779,20 @@ function make_table_general(players) {
                rows.push(header);
        }
 
-       for (const [q,p] of Object.entries(players)) {
+       for (const [q,p] of get_sorted_players(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 pm = p.goals + p.assists + p.hockey_assists + p.defenses - p.throwaways - p.drops - p.was_ds - p.stallouts;
                let soft_pm = p.offensive_soft_plus + p.defensive_soft_plus - p.offensive_soft_minus - p.defensive_soft_minus;
                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?
+               let name = 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);
+               row.dataset.player = q;
                rows.push(row);
        }
 
@@ -770,7 +825,9 @@ function make_table_offense(players) {
                add_th(header, '%OK');
                add_th(header, 'Catches');
                add_th(header, 'Drops');
+               add_th(header, 'D-ed');
                add_th(header, '%OK');
+               add_th(header, 'Stalls');
                add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
@@ -779,10 +836,12 @@ function make_table_offense(players) {
        let throwaways = 0;
        let catches = 0;
        let drops = 0;
-       for (const [q,p] of Object.entries(players)) {
+       let was_ds = 0;
+       let stallouts = 0;
+       for (const [q,p] of get_sorted_players(players)) {
                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);
+               let catch_ok = make_binomial_ci(p.catches, p.catches + p.drops + p.was_ds, z);
 
                throw_ok.format = 'percentage';
                catch_ok.format = 'percentage';
@@ -801,20 +860,25 @@ function make_table_offense(players) {
                add_3cell_ci(row, throw_ok);
                add_3cell(row, p.catches);
                add_3cell(row, p.drops);
+               add_3cell(row, p.was_ds);
                add_3cell_ci(row, catch_ok);
+               add_3cell(row, p.stallouts);
                add_3cell(row, '+' + p.offensive_soft_plus);
                add_3cell(row, '-' + p.offensive_soft_minus);
+               row.dataset.player = q;
                rows.push(row);
 
                num_throws += p.num_throws;
                throwaways += p.throwaways;
                catches += p.catches;
                drops += p.drops;
+               was_ds += p.was_ds;
+               stallouts += p.stallouts;
        }
 
        // Globals.
        let throw_ok = make_binomial_ci(num_throws - throwaways, num_throws, z);
-       let catch_ok = make_binomial_ci(catches, catches + drops, z);
+       let catch_ok = make_binomial_ci(catches, catches + drops + was_ds, z);
        throw_ok.format = 'percentage';
        catch_ok.format = 'percentage';
        throw_ok.desired = 0.9;
@@ -830,7 +894,9 @@ function make_table_offense(players) {
        add_3cell_ci(row, throw_ok);
        add_3cell(row, catches);
        add_3cell(row, drops);
+       add_3cell(row, was_ds);
        add_3cell_ci(row, catch_ok);
+       add_3cell(row, stallouts);
        add_3cell(row, '');
        add_3cell(row, '');
        rows.push(row);
@@ -848,16 +914,17 @@ function make_table_defense(players) {
                add_th(header, 'OOB pulls');
                add_th(header, 'OOB%');
                add_th(header, 'Avg. hang time (IB)');
+               add_th(header, 'Callahans');
                add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
-       for (const [q,p] of Object.entries(players)) {
+       for (const [q,p] of get_sorted_players(players)) {
                if (q === 'globals') continue;
                let sum_time = 0;
                for (const t of p.pull_times) {
                        sum_time += t;
                }
-               let avg_time = 1e-3 * sum_time / p.pulls;
+               let avg_time = 1e-3 * sum_time / (p.pulls - p.oob_pulls);
                let oob_pct = 100 * p.oob_pulls / p.pulls;
 
                let ci_oob = make_binomial_ci(p.oob_pulls, p.pulls, z);
@@ -876,8 +943,10 @@ function make_table_defense(players) {
                } else {
                        add_3cell(row, 'N/A');
                }
+               add_3cell(row, p.callahans);
                add_3cell(row, '+' + p.defensive_soft_plus);
                add_3cell(row, '-' + p.defensive_soft_minus);
+               row.dataset.player = q;
                rows.push(row);
        }
        return rows;
@@ -898,7 +967,7 @@ function make_table_playing_time(players) {
                rows.push(header);
        }
 
-       for (const [q,p] of Object.entries(players)) {
+       for (const [q,p] of get_sorted_players(players)) {
                if (q === 'globals') continue;
                let row = document.createElement('tr');
                add_3cell(row, p.name, 'name');  // TODO: number?
@@ -909,6 +978,7 @@ function make_table_playing_time(players) {
                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);
+               row.dataset.player = q;
                rows.push(row);
        }
 
@@ -938,7 +1008,7 @@ function make_table_per_point(players) {
                add_th(header, 'Hockey assists');
                add_th(header, 'Ds');
                add_th(header, 'Throwaways');
-               add_th(header, 'Drops');
+               add_th(header, 'Recv. errors');
                add_th(header, 'Touches');
                rows.push(header);
        }
@@ -948,9 +1018,9 @@ function make_table_per_point(players) {
        let hockey_assists = 0;
        let defenses = 0;
        let throwaways = 0;
-       let drops = 0;
+       let receiver_errors = 0;
        let touches = 0;
-       for (const [q,p] of Object.entries(players)) {
+       for (const [q,p] of get_sorted_players(players)) {
                if (q === 'globals') continue;
 
                // Can only happen once per point, so these are binomials.
@@ -969,12 +1039,13 @@ function make_table_per_point(players) {
                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));
+               add_3cell_ci(row, make_poisson_ci(p.drops + p.was_ds, 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_3cell(row, 'N/A');
                }
+               row.dataset.player = q;
                rows.push(row);
 
                goals += p.goals;
@@ -982,7 +1053,7 @@ function make_table_per_point(players) {
                hockey_assists += p.hockey_assists;
                defenses += p.defenses;
                throwaways += p.throwaways;
-               drops += p.drops;
+               receiver_errors += p.drops + p.was_ds;
                touches += p.touches;
        }
 
@@ -996,7 +1067,7 @@ function make_table_per_point(players) {
                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_with_filler_ci(row, receiver_errors == 0 ? 0 : (receiver_errors / 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');
@@ -1026,14 +1097,16 @@ function open_filter_menu() {
        menu.style.left = rect.left + 'px';
        menu.style.top = (rect.bottom + 10) + 'px';
 
-       add_menu_item(menu, 0, 'match', 'Match (any)');
-       add_menu_item(menu, 1, 'player_any', 'Player on field (any)');
-       add_menu_item(menu, 2, 'player_all', 'Player on field (all)');
-       add_menu_item(menu, 3, 'formation_offense', 'Offense played (any)');
-       add_menu_item(menu, 4, 'formation_defense', 'Defense played (any)');
+       add_menu_item(global_filters, menu, 0, 'match', 'Match (any)');
+       add_menu_item(global_filters, menu, 1, 'player_any', 'Player on field (any)');
+       add_menu_item(global_filters, menu, 2, 'player_all', 'Player on field (all)');
+       add_menu_item(global_filters, menu, 3, 'formation_offense', 'Offense played (any)');
+       add_menu_item(global_filters, menu, 4, 'formation_defense', 'Defense played (any)');
+       add_menu_item(global_filters, menu, 5, 'starting_on', 'Starting on');
+       add_menu_item(global_filters, menu, 6, 'gender_ratio', 'Gender ratio');
 }
 
-function add_menu_item(menu, menu_idx, filter_type, title) {
+function add_menu_item(filterset, menu, menu_idx, filter_type, title) {
        let item = document.createElement('div');
        item.classList.add('option');
        item.appendChild(document.createTextNode(title));
@@ -1045,13 +1118,49 @@ function add_menu_item(menu, menu_idx, filter_type, title) {
 
        menu.appendChild(item);
 
-       item.addEventListener('click', (e) => { show_submenu(menu_idx, null, filter_type); });
+       item.addEventListener('click', (e) => { show_submenu(filterset, menu_idx, null, filter_type); });
+}
+
+function find_all_ratios(json)
+{
+       let ratios = {};
+       let players = {};
+       for (const player of json['players']) {
+               players[player['player_id']] = {
+                       'gender': player['gender'],
+                       'last_point_seen': null,
+               };
+       }
+       for (const match of json['matches']) {
+               for (const [q,p] of Object.entries(players)) {
+                       p.on_field_since = null;
+               }
+               for (const e of match['events']) {
+                       let p = players[e['player']];
+                       let type = e['type'];
+                       if (type === 'in') {
+                               p.on_field_since = 1;
+                       } else if (type === 'out') {
+                               p.on_field_since = null;
+                       } else if (type === 'pull' || type == 'their_pull') {  // We assume no cross-gender subs for now.
+                               let code = find_gender_ratio_code(players);
+                               if (ratios[code] === undefined) {
+                                       ratios[code] = code;
+                                       if (code !== '4 F, 3 M' && code !== '4 M, 3 F' && code !== '3 M, 2 F' && code !== '3 F, 2 M') {
+                                               console.log('Unexpected gender ratio ' + code + ' first seen at: ' +
+                                                           match['description'] + ', ' + format_time(e['t']));
+                                       }
+                               }
+                       }
+               }
+       }
+       return ratios;
 }
 
-function show_submenu(menu_idx, pill, filter_type) {
+function show_submenu(filterset, menu_idx, pill, filter_type) {
        let submenu = document.getElementById('filter-submenu');
        let subitems = [];
-       const filter = find_filter(filter_type);
+       const filter = find_filter(filterset, filter_type);
 
        let choices = [];
        if (filter_type === 'match') {
@@ -1094,6 +1203,22 @@ function show_submenu(menu_idx, pill, filter_type) {
                                });
                        }
                }
+       } else if (filter_type === 'starting_on') {
+               choices.push({
+                       'title': 'Offense',
+                       'id': false,  // last_pull_was_ours
+               });
+               choices.push({
+                       'title': 'Defense',
+                       'id': true,  // last_pull_was_ours
+               });
+       } else if (filter_type === 'gender_ratio') {
+               for (const [title, id] of Object.entries(find_all_ratios(global_json)).sort()) {
+                       choices.push({
+                               'title': title,
+                               'id': id,
+                       });
+               }
        }
 
        for (const choice of choices) {
@@ -1108,7 +1233,7 @@ function show_submenu(menu_idx, pill, filter_type) {
                if (filter !== null && filter.elements.has(choice.id)) {
                        check.setAttribute('checked', 'checked');
                }
-               check.addEventListener('change', (e) => { checkbox_changed(e, filter_type, choice.id); });
+               check.addEventListener('change', (e) => { checkbox_changed(filterset, e, filter_type, choice.id); });
 
                subitem.appendChild(check);
                subitem.appendChild(document.createTextNode(choice.title));
@@ -1132,8 +1257,8 @@ function show_submenu(menu_idx, pill, filter_type) {
 }
 
 // Find the right filter, if it exists.
-function find_filter(filter_type) {
-       for (let f of global_filters) {
+function find_filter(filterset, filter_type) {
+       for (let f of filterset) {
                if (f.type === filter_type) {
                        return f;
                }
@@ -1141,8 +1266,19 @@ function find_filter(filter_type) {
        return null;
 }
 
-function checkbox_changed(e, filter_type, id) {
-       let filter = find_filter(filter_type);
+// Equivalent to Array.prototype.filter, but in-place.
+function inplace_filter(arr, cond) {
+       let j = 0;
+       for (let i = 0; i < arr.length; ++i) {
+               if (cond(arr[i])) {
+                       arr[j++] = arr[i];
+               }
+       }
+       arr.length = j;
+}
+
+function checkbox_changed(filterset, e, filter_type, id) {
+       let filter = find_filter(filterset, filter_type);
        if (e.target.checked) {
                // See if we must add a new filter to the list.
                if (filter === null) {
@@ -1150,12 +1286,12 @@ function checkbox_changed(e, filter_type, id) {
                                'type': filter_type,
                                'elements': new Set([ id ]),
                        };
-                       filter.pill = make_filter_pill(filter);
-                       global_filters.push(filter);
+                       filter.pill = make_filter_pill(filterset, filter);
+                       filterset.push(filter);
                        document.getElementById('filters').appendChild(filter.pill);
                } else {
                        filter.elements.add(id);
-                       let new_pill = make_filter_pill(filter);
+                       let new_pill = make_filter_pill(filterset, filter);
                        document.getElementById('filters').replaceChild(new_pill, filter.pill);
                        filter.pill = new_pill;
                }
@@ -1163,9 +1299,9 @@ function checkbox_changed(e, filter_type, id) {
                filter.elements.delete(id);
                if (filter.elements.size === 0) {
                        document.getElementById('filters').removeChild(filter.pill);
-                       global_filters = global_filters.filter(f => f !== filter);
+                       inplace_filter(filterset, f => f !== filter);
                } else {
-                       let new_pill = make_filter_pill(filter);
+                       let new_pill = make_filter_pill(filterset, filter);
                        document.getElementById('filters').replaceChild(new_pill, filter.pill);
                        filter.pill = new_pill;
                }
@@ -1174,7 +1310,7 @@ function checkbox_changed(e, filter_type, id) {
        process_matches(global_json, global_filters);
 }
 
-function make_filter_pill(filter) {
+function make_filter_pill(filterset, filter) {
        let pill = document.createElement('div');
        pill.classList.add('filter-pill');
        let text;
@@ -1251,7 +1387,7 @@ function make_filter_pill(filter) {
                let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
                for (const formation_id of sorted_formation_id) {
                        if (!first) {
-                               text += ', ';
+                               ktext += ', ';
                        }
                        let desc = find_formation(formation_id)['name'];
                        if (common_prefix === null) {
@@ -1265,11 +1401,32 @@ function make_filter_pill(filter) {
                if (common_prefix !== null) {
                        text += ')';
                }
+       } else if (filter.type === 'starting_on') {
+               text = 'Starting on: ';
+
+               if (filter.elements.has(false) && filter.elements.has(true)) {
+                       text += 'Any';
+               } else if (filter.elements.has(false)) {
+                       text += 'Offense';
+               } else {
+                       text += 'Defense';
+               }
+       } else if (filter.type === 'gender_ratio') {
+               text = 'Gender: ';
+
+               let first = true;
+               for (const name of Array.from(filter.elements).sort()) {
+                       if (!first) {
+                               text += '; ';
+                       }
+                       text += name;
+                       first = false;
+               }
        }
 
        let text_node = document.createElement('span');
        text_node.innerText = text;
-       text_node.addEventListener('click', (e) => show_submenu(null, pill, filter.type));
+       text_node.addEventListener('click', (e) => show_submenu(filterset, null, pill, filter.type));
        pill.appendChild(text_node);
 
        pill.appendChild(document.createTextNode(' '));
@@ -1279,7 +1436,7 @@ function make_filter_pill(filter) {
        delete_node.addEventListener('click', (e) => {
                // Delete this filter entirely.
                document.getElementById('filters').removeChild(pill);
-               global_filters = global_filters.filter(f => f !== filter);
+               inplace_filter(filterset, f => f !== filter);
                process_matches(global_json, global_filters);
 
                let add_menu = document.getElementById('filter-add-menu');
@@ -1371,7 +1528,47 @@ function keep_match(match_id, filters) {
        return true;
 }
 
-function filter_passes(players, formations_used_this_point, filter) {
+function find_gender_ratio_code(players) {
+       let map = {};
+       for (const [q,p] of Object.entries(players)) {
+               if (p.on_field_since === null) {
+                       continue;
+               }
+               let gender = p.gender;
+               if (gender === '' || gender === undefined || gender === null) {
+                       gender = '?';
+               }
+               if (map[gender] === undefined) {
+                       map[gender] = 1;
+q              } else {
+                       ++map[gender];
+               }
+       }
+       let all_genders = Array.from(Object.keys(map)).sort(
+               (a,b) => {
+                       if (map[a] !== map[b]) {
+                               return map[b] - map[a];  // Reverse numeric.
+                       } else if (a < b) {
+                               return -1;
+                       } else if (a > b) {
+                               return 1;
+                       } else {
+                               return 0;
+                       }
+               });
+       let code = '';
+       for (const g of all_genders) {
+               if (code !== '') {
+                       code += ', ';
+               }
+               code += map[g];
+               code += ' ';
+               code += g;
+       }
+       return code;
+}
+
+function filter_passes(players, formations_used_this_point, last_pull_was_ours, filter) {
        if (filter.type === 'player_any') {
                for (const p of Array.from(filter.elements)) {
                        if (players[p].on_field_since !== null) {
@@ -1393,13 +1590,17 @@ function filter_passes(players, formations_used_this_point, filter) {
                        }
                }
                return false;
+       } else if (filter.type === 'starting_on') {
+               return filter.elements.has(last_pull_was_ours);
+       } else if (filter.type === 'gender_ratio') {
+               return filter.elements.has(find_gender_ratio_code(players));
        }
        return true;
 }
 
-function keep_event(players, formations_used_this_point, filters) {
+function keep_event(players, formations_used_this_point, last_pull_was_ours, filters) {
        for (const filter of filters) {
-               if (!filter_passes(players, formations_used_this_point, filter)) {
+               if (!filter_passes(players, formations_used_this_point, last_pull_was_ours, filter)) {
                        return false;
                }
        }
@@ -1421,7 +1622,7 @@ function should_reuse_last_formation(events, t) {
                if (type === 'their_goal' || type === 'goal' ||
                    type === 'set_defense' || type === 'set_offense' ||
                    type === 'throwaway' || type === 'their_throwaway' ||
-                   type === 'drop' || type === 'defense' || type === 'interception' ||
+                   type === 'drop' || type === 'was_d' || type === 'stallout' || type === 'defense' || type === 'interception' ||
                    type === 'pull' || type === 'pull_landed' || type === 'pull_oob' || type === 'their_pull' ||
                    type === 'formation_offense' || type === 'formation_defense') {
                        return false;
@@ -1441,3 +1642,52 @@ function possibly_close_menu(e) {
                add_submenu.style.display = 'none';
        }
 }
+
+let global_sort = {};
+
+function sort_by(th) {
+       let tr = th.parentElement;
+       let child_idx = 0;
+       for (let column_idx = 0; column_idx < tr.children.length; ++column_idx) {
+               let element = tr.children[column_idx];
+               if (element === th) {
+                       ++child_idx;  // Pad.
+                       break;
+               }
+               if (element.hasAttribute('colspan')) {
+                       child_idx += parseInt(element.getAttribute('colspan'));
+               } else {
+                       ++child_idx;
+               }
+       }
+
+       global_sort = {};
+       let table = tr.parentElement;
+       for (let row_idx = 1; row_idx < table.children.length - 1; ++row_idx) {  // Skip header and globals.
+               let row = table.children[row_idx];
+               let player = parseInt(row.dataset.player);
+               let value = row.children[child_idx].textContent;
+               global_sort[player] = value;
+       }
+}
+
+function get_sorted_players(players)
+{
+       let p = Object.entries(players);
+       if (global_sort.length !== 0) {
+               p.sort((a,b) => {
+                       let ai = parseFloat(global_sort[a[0]]);
+                       let bi = parseFloat(global_sort[b[0]]);
+                       if (ai == ai && bi == bi) {
+                               return bi - ai;  // Reverse numeric.
+                       } else if (global_sort[a[0]] < global_sort[b[0]]) {
+                               return -1;
+                       } else if (global_sort[a[0]] > global_sort[b[0]]) {
+                               return 1;
+                       } else {
+                               return 0;
+                       }
+               });
+       }
+       return p;
+}