Fix a threading issue, where we would call into the Qt thread from the video thread.

[pkanalytics] / ultimate.js

diff --git a/ultimate.js b/ultimate.js
index 0655b2fb79a4b7c27796eb04490b37eb96b432e9..56ee933671c3c8dc361f919ffba2e5eddbfa5d11 100644 (file)
--- a/ultimate.js
+++ b/ultimate.js
@@ -164,6 +164,7 @@ function process_matches(json, filters) {
                        'num_throws': 0,
                        'throwaways': 0,
                        'drops': 0,
+                       'was_ds': 0,
 
                        'defenses': 0,
                        'interceptions': 0,
@@ -392,7 +393,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') {
                                offense = false;
                        } else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
                                offense = true;
@@ -506,6 +507,9 @@ function process_matches(json, filters) {
                        } else if (type === 'drop') {
                                if (keep) ++p.drops;
                                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') {
@@ -521,7 +525,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 !== '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') {
@@ -728,7 +732,7 @@ function make_table_general(players) {
        for (const [q,p] of Object.entries(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;
                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);
@@ -770,6 +774,7 @@ 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, 'Soft +/-', 6);
                rows.push(header);
@@ -779,10 +784,11 @@ function make_table_offense(players) {
        let throwaways = 0;
        let catches = 0;
        let drops = 0;
+       let was_ds = 0;
        for (const [q,p] of Object.entries(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,6 +807,7 @@ 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.offensive_soft_plus);
                add_3cell(row, '-' + p.offensive_soft_minus);
@@ -810,11 +817,12 @@ function make_table_offense(players) {
                throwaways += p.throwaways;
                catches += p.catches;
                drops += p.drops;
+               was_ds += p.was_ds;
        }
 
        // 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,6 +838,7 @@ 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, '');
        add_3cell(row, '');
@@ -857,7 +866,7 @@ function make_table_defense(players) {
                for (const t of p.pull_times) {
                        sum_time += t;
                }
-               let avg_time = 1e-3 * sum_time / p.pulls;
+               let avg_time = 1e-3 * sum_time / (p.pulls - p.oob_pulls);
                let oob_pct = 100 * p.oob_pulls / p.pulls;
 
                let ci_oob = make_binomial_ci(p.oob_pulls, p.pulls, z);
@@ -938,7 +947,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,7 +957,7 @@ 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)) {
                if (q === 'globals') continue;
@@ -969,7 +978,7 @@ 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 {
@@ -982,7 +991,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 +1005,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');