.then(response => response.json())
.then(response => { global_json = response; process_matches(global_json, global_filters); });
+function format_time(t)
+{
+ const ms = t % 1000 + '';
+ t = Math.floor(t / 1000);
+ const sec = t % 60 + '';
+ t = Math.floor(t / 60);
+ const min = t % 60 + '';
+ const hour = Math.floor(t / 60) + '';
+ return hour + ':' + min.padStart(2, '0') + ':' + sec.padStart(2, '0') + '.' + ms.padStart(3, '0');
+}
+
function attribute_player_time(player, to, from, offense) {
let delta_time;
if (player.on_field_since > from) {
}
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 {
'num_throws': 0,
'throwaways': 0,
'drops': 0,
+ 'was_ds': 0,
+ 'stallouts': 0,
'defenses': 0,
- 'interceptions': 0,
+ 'callahans': 0,
'points_played': 0,
'playing_time_ms': 0,
'offensive_playing_time_ms': 0,
let our_score = 0;
let their_score = 0;
let handler = null;
+ let handler_got_by_interception = false; // Only relevant if handler !== null.
let prev_handler = null;
let live_since = null;
let offense = null; // True/false/null (unknown).
let p = players[e['player']];
// Sub management
- let keep = keep_event(players, formations_used_this_point, filters);
+ let keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
if (type === 'in' && p.on_field_since === null) {
p.on_field_since = t;
- if (!keep && keep_event(players, formations_used_this_point, filters)) {
+ if (!keep && keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
// A player needed for the filters went onto the field,
// so pretend people walked on right now (to start their
// counting time).
}
} else if (type === 'out') {
take_off_field(p, t, live_since, offense, keep);
- if (keep && !keep_event(players, formations_used_this_point, filters)) {
+ if (keep && !keep_event(players, formations_used_this_point, last_pull_was_ours, filters)) {
// A player needed for the filters went off the field,
// so we need to attribute time for all the others.
// Pretend they walked off and then immediately on again.
}
}
- keep = keep_event(players, formations_used_this_point, filters); // Recompute after in/out.
+ keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters); // Recompute after in/out.
// Liveness management
if (type === 'pull' || type === 'their_pull' || type === 'restart') {
live_since = t;
} else if (type === 'catch' && last_pull_was_ours === null) {
// Someone forgot to add the pull, so we'll need to wing it.
- console.log('Missing pull on ' + our_score + '\u2013' + their_score + ' in ' + match['description'] + '; pretending to have one.');
+ console.log(match['description'] + ' ' + format_time(t) + ': Missing pull on ' + our_score + '\u2013' + their_score + '; pretending to have one.');
live_since = t;
last_pull_was_ours = !offense;
} else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') {
// 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;
}
}
+ if (type !== 'out' && type !== 'in' && p !== undefined && p.on_field_since === null) {
+ console.log(match['description'] + ' ' + format_time(t) + ': Event “' + type + '” on subbed-out player ' + p.name);
+ }
+ if (type === 'catch' && handler !== null && players[handler].on_field_since === null) {
+ // The handler subbed out and was replaced with another handler,
+ // so this wasn't a pass.
+ handler = null;
+ }
+
// Event management
- if (type === 'catch' || type === 'goal') {
+ if (type === 'goal' && handler === e['player'] && handler_got_by_interception) {
+ // Self-pass to goal after an interception; this is not a real pass,
+ // just how we represent a Callahan right now -- so don't
+ // count the throw, any assists or similar.
+ //
+ // It's an open question how we should handle a self-pass that is
+ // _not_ after an interception, or a self-pass that's not a goal.
+ // (It must mean we tipped off someone.) We'll count it as a regular one
+ // for the time being, although it will make hockey assists weird.
+ ++p.goals;
+ ++p.callahans;
+ handler = prev_handler = null;
+ } else if (type === 'catch' || type === 'goal') {
if (handler !== null) {
if (keep) {
++players[handler].num_throws;
// Update hold history.
prev_handler = handler;
handler = e['player'];
+ handler_got_by_interception = false;
}
} else if (type === 'throwaway') {
if (keep) {
} 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;
}
prev_handler = null;
handler = e['player'];
+ handler_got_by_interception = true;
} else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
if (keep) ++p[type];
} 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') {
- console.log("Unknown event:", e);
+ console.log(format_time(t) + ": Unknown event “" + e + "”");
}
if (type === 'goal' || type === 'their_goal') {
}
// Add field time for all players still left at match end.
- const keep = keep_event(players, formations_used_this_point, filters);
+ const keep = keep_event(players, formations_used_this_point, last_pull_was_ours, filters);
if (keep) {
for (const [q,p] of Object.entries(players)) {
if (p.on_field_since !== null && last_goal !== null) {
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);
}
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);
}
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';
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;
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);
add_th(header, 'OOB pulls');
add_th(header, 'OOB%');
add_th(header, 'Avg. hang time (IB)');
+ add_th(header, 'Callahans');
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) {
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);
} else {
add_3cell(row, 'N/A');
}
+ add_3cell(row, p.callahans);
add_3cell(row, '+' + p.defensive_soft_plus);
add_3cell(row, '-' + p.defensive_soft_minus);
+ row.dataset.player = q;
rows.push(row);
}
return rows;
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?
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);
}
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);
}
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.
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;
hockey_assists += p.hockey_assists;
defenses += p.defenses;
throwaways += p.throwaways;
- drops += p.drops;
+ receiver_errors += p.drops + p.was_ds;
touches += p.touches;
}
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');
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');
}
function add_menu_item(menu, menu_idx, filter_type, title) {
});
}
}
+ } else if (filter_type === 'starting_on') {
+ choices.push({
+ 'title': 'Offense',
+ 'id': false, // last_pull_was_ours
+ });
+ choices.push({
+ 'title': 'Defense',
+ 'id': true, // last_pull_was_ours
+ });
}
for (const choice of choices) {
let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
for (const formation_id of sorted_formation_id) {
if (!first) {
- text += ', ';
+ ktext += ', ';
}
let desc = find_formation(formation_id)['name'];
if (common_prefix === null) {
if (common_prefix !== null) {
text += ')';
}
+ } else if (filter.type === 'starting_on') {
+ text = 'Starting on: ';
+
+ if (filter.elements.has(false) && filter.elements.has(true)) {
+ text += 'Any';
+ } else if (filter.elements.has(false)) {
+ text += 'Offense';
+ } else {
+ text += 'Defense';
+ }
}
let text_node = document.createElement('span');
return true;
}
-function filter_passes(players, formations_used_this_point, filter) {
+function filter_passes(players, formations_used_this_point, last_pull_was_ours, filter) {
if (filter.type === 'player_any') {
for (const p of Array.from(filter.elements)) {
if (players[p].on_field_since !== null) {
}
}
return false;
+ } else if (filter.type === 'starting_on') {
+ return filter.elements.has(last_pull_was_ours);
}
return true;
}
-function keep_event(players, formations_used_this_point, filters) {
+function keep_event(players, formations_used_this_point, last_pull_was_ours, filters) {
for (const filter of filters) {
- if (!filter_passes(players, formations_used_this_point, filter)) {
+ if (!filter_passes(players, formations_used_this_point, last_pull_was_ours, filter)) {
return false;
}
}
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;
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;
+}
projects / pkanalytics / blobdiff