Count interceptions towards (successful) catches.

[pkanalytics] / ultimate.js

diff --git a/ultimate.js b/ultimate.js
index 32dd2493d539260fd12a2df4e77600e3cdd53bf1..57155dbb0c707256448c31b84da75709661ae458 100644 (file)
--- a/ultimate.js
+++ b/ultimate.js
@@ -175,9 +175,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,
@@ -403,7 +403,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;
@@ -517,6 +517,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,7 +527,7 @@ function process_matches(json, filters) {
                                if (keep) ++p.defenses;
                        } else if (type === 'interception') {
                                if (keep) {
-                                       ++p.interceptions;
+                                       ++p.catches;
                                        ++p.defenses;
                                        ++p.touches;
                                }
@@ -535,7 +538,7 @@ 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') {
@@ -742,7 +745,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 +790,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 +800,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 +825,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 +836,7 @@ function make_table_offense(players) {
                catches += p.catches;
                drops += p.drops;
                was_ds += p.was_ds;
+               stallouts += p.stallouts;
        }
 
        // Globals.
@@ -852,6 +859,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);
@@ -1445,7 +1453,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;