]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Adjust the Poisson CI range, since we were frequently getting out of 0.25.
[pkanalytics] / ultimate.js
index f70426d02663ad0533c1daaece13eae123debcce..5642c73ef4175d47561ef622f6154e2b7a2d7112 100644 (file)
@@ -753,14 +753,14 @@ function make_poisson_ci(val, num, z, inverted)
        // Fix the signs so that we don't get -0.00.
        low = Math.max(low, 0.0);
 
-       // The display range of 0 to 0.25 is fairly arbitrary. So is the desired 0.05 per point.
+       // The display range of 0 to 0.5 is fairly arbitrary. So is the desired 0.05 per point.
        let avg = val / num;
        return {
                'val': avg,
                'lower_ci': low,
                'upper_ci': high,
                'min': 0.0,
-               'max': 0.25,
+               'max': 0.5,
                'desired': 0.05,
                'inverted': inverted,
        };
@@ -832,6 +832,7 @@ function make_table_offense(players) {
                rows.push(header);
        }
 
+       let goals = 0;
        let num_throws = 0;
        let throwaways = 0;
        let catches = 0;
@@ -868,6 +869,7 @@ function make_table_offense(players) {
                row.dataset.player = q;
                rows.push(row);
 
+               goals += p.goals;
                num_throws += p.num_throws;
                throwaways += p.throwaways;
                catches += p.catches;
@@ -886,7 +888,7 @@ function make_table_offense(players) {
 
        let row = document.createElement('tr');
        add_3cell(row, '');
-       add_3cell(row, '');
+       add_3cell(row, goals);
        add_3cell(row, '');
        add_3cell(row, '');
        add_3cell(row, num_throws);
@@ -918,6 +920,13 @@ function make_table_defense(players) {
                add_th(header, 'Soft +/-', 6);
                rows.push(header);
        }
+
+       let defenses = 0;
+       let pulls = 0;
+       let oob_pulls = 0;
+       let sum_sum_time = 0;
+       let callahans = 0;
+
        for (const [q,p] of get_sorted_players(players)) {
                if (q === 'globals') continue;
                let sum_time = 0;
@@ -948,7 +957,39 @@ function make_table_defense(players) {
                add_3cell(row, '-' + p.defensive_soft_minus);
                row.dataset.player = q;
                rows.push(row);
+
+               defenses += p.defenses;
+               pulls += p.pulls;
+               oob_pulls += p.oob_pulls;
+               sum_sum_time += sum_time;
+               callahans += p.callahans;
        }
+
+       // Globals.
+       let ci_oob = make_binomial_ci(oob_pulls, pulls, z);
+       ci_oob.format = 'percentage';
+       ci_oob.desired = 0.2;  // Arbitrary.
+       ci_oob.inverted = true;
+
+       let avg_time = 1e-3 * sum_sum_time / (pulls - oob_pulls);
+       let oob_pct = 100 * oob_pulls / pulls;
+
+       let row = document.createElement('tr');
+       add_3cell(row, '');
+       add_3cell(row, defenses);
+       add_3cell(row, pulls);
+       add_3cell(row, oob_pulls);
+       add_3cell_ci(row, ci_oob);
+       if (pulls > oob_pulls) {
+               add_3cell(row, avg_time.toFixed(1) + ' sec');
+       } else {
+               add_3cell(row, 'N/A');
+       }
+       add_3cell(row, callahans);
+       add_3cell(row, '');
+       add_3cell(row, '');
+       rows.push(row);
+
        return rows;
 }
 
@@ -1062,12 +1103,21 @@ function make_table_per_point(players) {
        let row = document.createElement('tr');
        add_3cell(row, '');
        if (globals.points_played > 0) {
-               add_3cell_with_filler_ci(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
-               add_3cell_with_filler_ci(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
-               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, receiver_errors == 0 ? 0 : (receiver_errors / globals.points_played).toFixed(2));
+               let ci_goals = make_binomial_ci(goals, globals.points_played, z);
+               let ci_assists = make_binomial_ci(assists, globals.points_played, z);
+               let ci_hockey_assists = make_binomial_ci(hockey_assists, globals.points_played, z);
+               ci_goals.desired = 0.5;
+               ci_assists.desired = 0.5;
+               ci_hockey_assists.desired = 0.5;
+
+               add_3cell_ci(row, ci_goals);
+               add_3cell_ci(row, ci_assists);
+               add_3cell_ci(row, ci_hockey_assists);
+
+               add_3cell_ci(row, make_poisson_ci(defenses, globals.points_played, z));
+               add_3cell_ci(row, make_poisson_ci(throwaways, globals.points_played, z, true));
+               add_3cell_ci(row, make_poisson_ci(receiver_errors, globals.points_played, z, true));
+
                add_3cell(row, touches == 0 ? 0 : (touches / globals.points_played).toFixed(2));
        } else {
                add_3cell_with_filler_ci(row, 'N/A');
@@ -1097,16 +1147,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(menu, 5, 'starting_on', 'Starting on');
-       add_menu_item(menu, 6, 'gender_ratio', 'Gender ratio');
+       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));
@@ -1118,7 +1168,7 @@ 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)
@@ -1157,10 +1207,10 @@ function find_all_ratios(json)
        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') {
@@ -1233,7 +1283,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));
@@ -1257,8 +1307,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;
                }
@@ -1266,8 +1316,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) {
@@ -1275,12 +1336,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;
                }
@@ -1288,9 +1349,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;
                }
@@ -1299,7 +1360,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;
@@ -1415,7 +1476,7 @@ function make_filter_pill(filter) {
 
        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(' '));
@@ -1425,7 +1486,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');