]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Count callahans in the viewer.
[pkanalytics] / ultimate.js
index 32dd2493d539260fd12a2df4e77600e3cdd53bf1..b6f4aedb206c014ade421d84928d1aa53846c642 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) {
@@ -175,9 +186,10 @@ function process_matches(json, filters) {
                        '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,
@@ -228,6 +240,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).
@@ -299,7 +312,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') {
@@ -403,7 +416,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;
@@ -482,8 +495,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;
@@ -507,6 +541,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) {
@@ -517,6 +552,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;
@@ -524,22 +562,23 @@ function process_matches(json, filters) {
                                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 !== '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') {
@@ -742,7 +781,7 @@ function make_table_general(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);
@@ -787,6 +826,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);
        }
@@ -796,6 +836,7 @@ function make_table_offense(players) {
        let catches = 0;
        let drops = 0;
        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);
@@ -820,6 +861,7 @@ 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;
@@ -830,6 +872,7 @@ function make_table_offense(players) {
                catches += p.catches;
                drops += p.drops;
                was_ds += p.was_ds;
+               stallouts += p.stallouts;
        }
 
        // Globals.
@@ -852,6 +895,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);
@@ -869,6 +913,7 @@ 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);
        }
@@ -897,6 +942,7 @@ 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;
@@ -1445,7 +1491,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;