]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Count interceptions towards (successful) catches.
[pkanalytics] / ultimate.js
index 22ff78b42992a5a38c820234f2676b252b47b220..57155dbb0c707256448c31b84da75709661ae458 100644 (file)
@@ -49,7 +49,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 {
@@ -164,9 +174,10 @@ function process_matches(json, filters) {
                        'num_throws': 0,
                        '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,
@@ -392,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') {
+                       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;
@@ -506,11 +517,17 @@ 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;
                                }
@@ -521,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 !== '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') {
@@ -725,19 +742,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 +788,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 +799,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 +823,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 +857,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);
@@ -851,7 +880,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) {
@@ -878,6 +907,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;
@@ -898,7 +928,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 +939,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 +969,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 +979,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 +1000,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 +1014,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 +1028,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');
@@ -1421,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;
@@ -1441,3 +1473,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;
+}