]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Do not output a warning for disc transfer during subs; it is not an error.
[pkanalytics] / ultimate.js
index 56ee933671c3c8dc361f919ffba2e5eddbfa5d11..2b483e225a68039c41023474d31a88f1122cbb06 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 {
@@ -165,9 +186,9 @@ function process_matches(json, filters) {
                        'throwaways': 0,
                        'drops': 0,
                        'was_ds': 0,
+                       'stallouts': 0,
 
                        'defenses': 0,
-                       'interceptions': 0,
                        'points_played': 0,
                        'playing_time_ms': 0,
                        'offensive_playing_time_ms': 0,
@@ -289,7 +310,7 @@ function process_matches(json, filters) {
                                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') {
@@ -393,7 +414,7 @@ function process_matches(json, filters) {
 
                        // Offense/defense management
                        let last_offense = offense;
-                       if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop' || type === 'was_d') {
+                       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;
@@ -472,6 +493,15 @@ 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 (handler !== null) {
@@ -507,6 +537,9 @@ 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;
@@ -514,7 +547,7 @@ function process_matches(json, filters) {
                                if (keep) ++p.defenses;
                        } else if (type === 'interception') {
                                if (keep) {
-                                       ++p.interceptions;
+                                       ++p.catches;
                                        ++p.defenses;
                                        ++p.touches;
                                }
@@ -525,11 +558,11 @@ function process_matches(json, filters) {
                        } 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 !== 'was_d' && 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') {
@@ -729,19 +762,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 - p.was_ds;
+               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);
        }
 
@@ -776,6 +810,7 @@ function make_table_offense(players) {
                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);
        }
@@ -785,7 +820,8 @@ function make_table_offense(players) {
        let catches = 0;
        let drops = 0;
        let was_ds = 0;
-       for (const [q,p] of Object.entries(players)) {
+       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 + p.was_ds, z);
@@ -809,8 +845,10 @@ function make_table_offense(players) {
                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;
@@ -818,6 +856,7 @@ function make_table_offense(players) {
                catches += p.catches;
                drops += p.drops;
                was_ds += p.was_ds;
+               stallouts += p.stallouts;
        }
 
        // Globals.
@@ -840,6 +879,7 @@ function make_table_offense(players) {
        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);
@@ -860,7 +900,7 @@ function make_table_defense(players) {
                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) {
@@ -887,6 +927,7 @@ function make_table_defense(players) {
                }
                add_3cell(row, '+' + p.defensive_soft_plus);
                add_3cell(row, '-' + p.defensive_soft_minus);
+               row.dataset.player = q;
                rows.push(row);
        }
        return rows;
@@ -907,7 +948,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?
@@ -918,6 +959,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);
        }
 
@@ -959,7 +1001,7 @@ function make_table_per_point(players) {
        let throwaways = 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.
@@ -984,6 +1026,7 @@ function make_table_per_point(players) {
                } else {
                        add_3cell(row, 'N/A');
                }
+               row.dataset.player = q;
                rows.push(row);
 
                goals += p.goals;
@@ -1430,7 +1473,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;
@@ -1450,3 +1493,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;
+}