]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Add some team-wide touches stats.
[pkanalytics] / ultimate.js
index 292534f23dd1f25293c4dad28133d1e0cd4f08bb..7e54560141821432b3a65f154dca8168a3b08fdd 100644 (file)
@@ -229,8 +229,19 @@ function calc_stats(json, filters) {
 
                'offensive_points_completed': 0,
                'offensive_points_won': 0,
+               'clean_holds': 0,
+
                'defensive_points_completed': 0,
                'defensive_points_won': 0,
+               'clean_breaks': 0,
+
+               'turnovers_won': 0,
+               'turnovers_lost': 0,
+               'their_clean_holds': 0,
+               'their_clean_breaks': 0,
+
+               'touches_for_turnover': 0,
+               'touches_for_goal': 0,
        };
        let globals = players['globals'];
 
@@ -256,6 +267,10 @@ function calc_stats(json, filters) {
                let current_predominant_gender = null;
                let current_num_players_on_field = null;
 
+               let we_lost_disc = false;
+               let they_lost_disc = false;
+               let touches_this_possession = 0;
+
                // The last used formations of the given kind, if any; they may be reused
                // when the point starts, if nothing else is set.
                let last_offensive_formation = null;
@@ -363,6 +378,10 @@ function calc_stats(json, filters) {
                                last_pull_was_ours = !offense;
                                between_points = false;
                        } else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') {
+                               if (type === 'goal') {
+                                       if (keep) ++p.touches;
+                                       ++touches_this_possession;
+                               }
                                for (const [q,p] of Object.entries(players)) {
                                        if (p.on_field_since === null) {
                                                continue;
@@ -426,10 +445,8 @@ function calc_stats(json, filters) {
                        // Score management
                        if (type === 'goal') {
                                ++our_score;
-                               between_points = true;
                        } else if (type === 'their_goal') {
                                ++their_score;
-                               between_points = true;
                        }
 
                        // Point count management
@@ -463,12 +480,48 @@ function calc_stats(json, filters) {
                                puller = pull_started = null;
                        }
 
+                       // Stats for clean holds or not (must be done before resetting we_lost_disc etc. below).
+                       if (keep) {
+                               if (type === 'goal' && !we_lost_disc) {
+                                       if (last_pull_was_ours === false) {  // O point.
+                                               ++globals.clean_holds;
+                                       } else if (last_pull_was_ours === true) {
+                                               ++globals.clean_breaks;
+                                       }
+                               } else if (type === 'their_goal' && !they_lost_disc) {
+                                       if (last_pull_was_ours === true) {  // O point for them.
+                                               ++globals.their_clean_holds;
+                                       } else if (last_pull_was_ours === false) {
+                                               ++globals.their_clean_breaks;
+                                       }
+                               }
+                       }
+
                        // Offense/defense management
                        let last_offense = offense;
                        if (type === 'set_defense' || type === 'goal' || type === 'throwaway' || type === 'drop' || type === 'was_d' || type === 'stallout') {
                                offense = false;
+                               we_lost_disc = true;
+                               if (keep && type !== 'goal' && !(type === 'set_defense' && last_pull_was_ours === null)) {
+                                       ++globals.turnovers_lost;
+                                       globals.touches_for_turnover += touches_this_possession;
+                               } else if (keep && type === 'goal') {
+                                       globals.touches_for_goal += touches_this_possession;
+                               }
+                               touches_this_possession = 0;
                        } else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
                                offense = true;
+                               they_lost_disc = true;
+                               if (keep && type !== 'their_goal' && !(type === 'set_offense' && last_pull_was_ours === null)) {
+                                       ++globals.turnovers_won;
+                               }
+                               touches_this_possession = 0;
+                       }
+                       if (type === 'goal' || type === 'their_goal') {
+                               between_points = true;
+                               we_lost_disc = false;
+                               they_lost_disc = false;
+                               touches_this_possession = 0;
                        }
                        if (last_offense !== offense && live_since !== null) {
                                // Switched offense/defense status, so attribute this drive as needed,
@@ -577,6 +630,7 @@ function calc_stats(json, filters) {
                                }
 
                                if (keep) ++p.touches;
+                               ++touches_this_possession;
                                if (type === 'goal') {
                                        if (keep) {
                                                if (prev_handler !== null) {
@@ -616,6 +670,7 @@ function calc_stats(json, filters) {
                                        ++p.catches;
                                        ++p.defenses;
                                        ++p.touches;
+                                       ++touches_this_possession;
                                }
                                prev_handler = null;
                                handler = e['player'];
@@ -684,6 +739,8 @@ function process_matches(json, filtersets) {
                        rows = make_table_playing_time(players);
                } else if (chosen_category === 'per_point') {
                        rows = make_table_per_point(players);
+               } else if (chosen_category === 'team_wide') {
+                       rows = make_table_team_wide(players);
                }
                rowsets.push(rows);
        }
@@ -743,6 +800,8 @@ function get_chosen_category() {
                return 'playing_time';
        } else if (window.location.hash === '#per_point') {
                return 'per_point';
+       } else if (window.location.hash === '#team_wide') {
+               return 'team_wide';
        } else {
                return 'general';
        }
@@ -750,59 +809,25 @@ function get_chosen_category() {
 
 function write_main_menu(chosen_category) {
        let elems = [];
-       if (chosen_category === 'general') {
-               let span = document.createElement('span');
-               span.innerText = 'General';
-               elems.push(span);
-       } else {
-               let a = document.createElement('a');
-               a.appendChild(document.createTextNode('General'));
-               a.setAttribute('href', '#general');
-               elems.push(a);
-       }
-
-       if (chosen_category === 'offense') {
-               let span = document.createElement('span');
-               span.innerText = 'Offense';
-               elems.push(span);
-       } else {
-               let a = document.createElement('a');
-               a.appendChild(document.createTextNode('Offense'));
-               a.setAttribute('href', '#offense');
-               elems.push(a);
-       }
-
-       if (chosen_category === 'defense') {
-               let span = document.createElement('span');
-               span.innerText = 'Defense';
-               elems.push(span);
-       } else {
-               let a = document.createElement('a');
-               a.appendChild(document.createTextNode('Defense'));
-               a.setAttribute('href', '#defense');
-               elems.push(a);
-       }
-
-       if (chosen_category === 'playing_time') {
-               let span = document.createElement('span');
-               span.innerText = 'Playing time';
-               elems.push(span);
-       } else {
-               let a = document.createElement('a');
-               a.appendChild(document.createTextNode('Playing time'));
-               a.setAttribute('href', '#playing_time');
-               elems.push(a);
-       }
-
-       if (chosen_category === 'per_point') {
-               let span = document.createElement('span');
-               span.innerText = 'Per point';
-               elems.push(span);
-       } else {
-               let a = document.createElement('a');
-               a.appendChild(document.createTextNode('Per point'));
-               a.setAttribute('href', '#per_point');
-               elems.push(a);
+       const categories = [
+               ['general', 'General'],
+               ['offense', 'Offense'],
+               ['defense', 'Defense'],
+               ['playing_time', 'Playing time'],
+               ['per_point', 'Per point'],
+               ['team_wide', 'Team-wide'],
+       ];
+       for (const [id, title] of categories) {
+               if (chosen_category === id) {
+                       let span = document.createElement('span');
+                       span.innerText = title;
+                       elems.push(span);
+               } else {
+                       let a = document.createElement('a');
+                       a.appendChild(document.createTextNode(title));
+                       a.setAttribute('href', '#' + id);
+                       elems.push(a);
+               }
        }
 
        document.getElementById('mainmenu').replaceChildren(...elems);
@@ -852,6 +877,8 @@ function make_efficiency_ci(points_won, points_completed, z)
 //
 // Modified Wald (recommended by http://www.ine.pt/revstat/pdf/rs120203.pdf
 // since our rates are definitely below 2 per point).
+//
+// FIXME: z is ignored.
 function make_poisson_ci(val, num, z, inverted)
 {
        let low  = (val == 0) ? 0.0 : ((val - 0.5) - Math.sqrt(val - 0.5)) / num;
@@ -873,6 +900,31 @@ function make_poisson_ci(val, num, z, inverted)
        };
 }
 
+// Wilson and Hilferty, again recommended for general use in the PDF above
+// (anything from their group “G1” works).
+// https://en.wikipedia.org/wiki/Poisson_distribution#Confidence_interval
+function make_poisson_ci_large(val, num, z, inverted)
+{
+       let low  = val * Math.pow(1.0 - 1.0 / (9.0 * val) - z / (3.0 * Math.sqrt(val)), 3.0) / num;
+       let high = (val + 1.0) * Math.pow(1.0 - 1.0 / (9.0 * (val + 1.0)) + z / (3.0 * Math.sqrt(val + 1.0)), 3.0) / num;
+
+       // Fix the signs so that we don't get -0.00.
+       low = Math.max(low, 0.0);
+
+       // The display range of 0 to 25.0 is fairly arbitrary. We have no desire here
+       // (this is used for number of touches).
+       let avg = val / num;
+       return {
+               'val': avg,
+               'lower_ci': low,
+               'upper_ci': high,
+               'min': 0.0,
+               'max': 25.0,
+               'desired': 0.0,
+               'inverted': inverted,
+       };
+}
+
 function make_table_general(players) {
        let rows = [];
        {
@@ -919,6 +971,101 @@ function make_table_general(players) {
        return rows;
 }
 
+function make_table_team_wide(players) {
+       let globals = players['globals'];
+
+       let rows = [];
+       {
+               let header = document.createElement('tr');
+               add_th(header, '');
+               add_th(header, 'Our team', 6);
+               add_th(header, 'Opponents', 6);
+               rows.push(header);
+       }
+
+       // Turnovers.
+       {
+               let row = document.createElement('tr');
+               let name = add_3cell(row, 'Turnovers generated', 'name');
+               add_3cell(row, globals.turnovers_won);
+               add_3cell(row, '');
+               add_3cell(row, globals.turnovers_lost);
+               add_3cell(row, '');
+               rows.push(row);
+       }
+
+       // Clean holds.
+       {
+               let row = document.createElement('tr');
+               let name = add_3cell(row, 'Clean holds', 'name');
+               let our_clean_holds = make_binomial_ci(globals.clean_holds, globals.offensive_points_completed, z);
+               let their_clean_holds = make_binomial_ci(globals.their_clean_holds, globals.defensive_points_completed, z);
+               our_clean_holds.desired = 0.3;  // Arbitrary.
+               our_clean_holds.format = 'percentage';
+               their_clean_holds.desired = 0.3;
+               their_clean_holds.format = 'percentage';
+               add_3cell(row, globals.clean_holds + ' / ' + globals.offensive_points_completed);
+               add_3cell_ci(row, our_clean_holds);
+               add_3cell(row, globals.their_clean_holds + ' / ' + globals.defensive_points_completed);
+               add_3cell_ci(row, their_clean_holds);
+               rows.push(row);
+       }
+
+       // Clean breaks.
+       {
+               let row = document.createElement('tr');
+               let name = add_3cell(row, 'Clean breaks', 'name');
+               let our_clean_breaks = make_binomial_ci(globals.clean_breaks, globals.defensive_points_completed, z);
+               let their_clean_breaks = make_binomial_ci(globals.their_clean_breaks, globals.offensive_points_completed, z);
+               our_clean_breaks.desired = 0.3;  // Arbitrary.
+               our_clean_breaks.format = 'percentage';
+               their_clean_breaks.desired = 0.3;
+               their_clean_breaks.format = 'percentage';
+               add_3cell(row, globals.clean_breaks + ' / ' + globals.defensive_points_completed);
+               add_3cell_ci(row, our_clean_breaks);
+               add_3cell(row, globals.their_clean_breaks + ' / ' + globals.offensive_points_completed);
+               add_3cell_ci(row, their_clean_breaks);
+               rows.push(row);
+       }
+
+       // Touches. We only have information for our team here.
+       {
+               let goals = 0;
+               for (const [q,p] of get_sorted_players(players)) {
+                       if (q === 'globals') continue;
+                       goals += p.goals;
+               }
+
+               let row = document.createElement('tr');
+               let name = add_3cell(row, 'Touches per possession (all)', 'name');
+               let touches = globals.touches_for_turnover + globals.touches_for_goal;
+               let possessions = goals + globals.turnovers_lost;
+               add_3cell(row, '');
+               add_3cell_ci(row, make_poisson_ci_large(touches, possessions, z));
+               add_3cell(row, '');
+               add_3cell(row, '');
+               rows.push(row);
+
+               row = document.createElement('tr');
+               add_3cell(row, 'Touches per possession (goals)', 'name');
+               add_3cell(row, '');
+               add_3cell_ci(row, make_poisson_ci_large(globals.touches_for_goal, goals, z));
+               add_3cell(row, '');
+               add_3cell(row, '');
+               rows.push(row);
+
+               row = document.createElement('tr');
+               add_3cell(row, 'Touches per possession (turnovers)', 'name');
+               add_3cell(row, '');
+               add_3cell_ci(row, make_poisson_ci_large(globals.touches_for_turnover, globals.turnovers_lost, z));
+               add_3cell(row, '');
+               add_3cell(row, '');
+               rows.push(row);
+       }
+
+       return rows;
+}
+
 function make_table_offense(players) {
        let rows = [];
        {