}
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,
'points_played': 0,
'playing_time_ms': 0,
'offensive_playing_time_ms': 0,
let point_num = 0;
let game_started = null;
let last_goal = null;
+
+ // 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;
+ let last_defensive_formation = null;
+
+ // Formations we've set, but haven't really had the chance to use yet
+ // (e.g., we get a “use zone defense” event while we're still on offense).
+ let pending_offensive_formation = null;
+ let pending_defensive_formation = null;
+
+ // Formations that we have played at least once this point, after all
+ // heuristics and similar.
+ let formations_used_this_point = new Set();
+
for (const [q,p] of Object.entries(players)) {
p.on_field_since = null;
p.last_point_seen = null;
let p = players[e['player']];
// Sub management
- let keep = keep_event(players, filters);
+ let keep = keep_event(players, formations_used_this_point, filters);
if (type === 'in' && p.on_field_since === null) {
p.on_field_since = t;
- if (!keep && keep_event(players, filters)) {
+ if (!keep && keep_event(players, formations_used_this_point, 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, filters)) {
+ if (keep && !keep_event(players, formations_used_this_point, 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, filters); // Recompute after in/out.
+ keep = keep_event(players, formations_used_this_point, filters); // Recompute after in/out.
// Liveness management
if (type === 'pull' || type === 'their_pull' || type === 'restart') {
// 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;
last_pull_was_ours = null;
}
+ // Formation management
+ if (type === 'formation_offense' || type === 'formation_defense') {
+ let id = e.formation === null ? 0 : e.formation;
+ let for_offense = (type === 'formation_offense');
+ if (offense === for_offense) {
+ formations_used_this_point.add(id);
+ } else if (for_offense) {
+ pending_offensive_formation = id;
+ } else {
+ pending_defensive_formation = id;
+ }
+ if (for_offense) {
+ last_offensive_formation = id;
+ } else {
+ last_defensive_formation = id;
+ }
+ } else if (last_offense !== offense) {
+ if (offense === true && pending_offensive_formation !== null) {
+ formations_used_this_point.add(pending_offensive_formation);
+ pending_offensive_formation = null;
+ } else if (offense === false && pending_defensive_formation !== null) {
+ formations_used_this_point.add(pending_defensive_formation);
+ pending_defensive_formation = null;
+ } else if (offense === true && last_defensive_formation !== null) {
+ if (should_reuse_last_formation(match['events'], t)) {
+ formations_used_this_point.add(last_defensive_formation);
+ }
+ } else if (offense === false && last_offensive_formation !== null) {
+ if (should_reuse_last_formation(match['events'], t)) {
+ formations_used_this_point.add(last_offensive_formation);
+ }
+ }
+ }
+
+ if (type !== 'out' && type !== 'in' && p !== undefined && p.on_field_since === null) {
+ console.log('Event “' + type + '” on subbed-out player ' + p.name + ' in ' + our_score + '\u2013' + their_score + ' in ' + match['description']);
+ }
+ 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.
+ console.log('Pass from subbed-out player ' + players[handler].name + ' in ' + our_score + '\u2013' + their_score + ' in ' + match['description'] + '; ignoring.');
+ handler = null;
+ }
+
// Event management
if (type === 'catch' || type === 'goal') {
if (handler !== null) {
} 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;
}
} 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 !== 'their_throwaway' && type !== 'defense' && type !== 'interception' &&
+ type !== 'formation_offense' && type !== 'formation_defense') {
console.log("Unknown event:", e);
}
+
+ if (type === 'goal' || type === 'their_goal') {
+ formations_used_this_point.clear();
+ }
}
// Add field time for all players still left at match end.
- const keep = keep_event(players, filters);
+ const keep = keep_event(players, formations_used_this_point, 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, '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);
}
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, 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, 'Formation played (any)');
+ add_menu_item(menu, 3, 'formation_offense', 'Offense played (any)');
+ add_menu_item(menu, 4, 'formation_defense', 'Defense played (any)');
}
function add_menu_item(menu, menu_idx, filter_type, title) {
'id': player['player_id']
});
}
+ } else if (filter_type === 'formation_offense') {
+ choices.push({
+ 'title': '(None/unknown)',
+ 'id': 0,
+ });
+ for (const formation of global_json['formations']) {
+ if (formation['offense']) {
+ choices.push({
+ 'title': formation['name'],
+ 'id': formation['formation_id']
+ });
+ }
+ }
+ } else if (filter_type === 'formation_defense') {
+ choices.push({
+ 'title': '(None/unknown)',
+ 'id': 0,
+ });
+ for (const formation of global_json['formations']) {
+ if (!formation['offense']) {
+ choices.push({
+ 'title': formation['name'],
+ 'id': formation['formation_id']
+ });
+ }
+ }
}
for (const choice of choices) {
if (filter.type === 'match') {
text = 'Match: ';
- // See if there's a common prefix.
- let num_matches = filter.elements.size;
- let common_prefix = null;
- if (num_matches > 1) {
- for (const match_id of filter.elements) {
- let desc = find_match(match_id)['description'];
- if (common_prefix === null) {
- common_prefix = desc;
- } else {
- common_prefix = find_common_prefix(common_prefix, desc);
- }
- }
- if (common_prefix.length < 3) {
- common_prefix = null;
- }
+ let all_names = [];
+ for (const match_id of filter.elements) {
+ all_names.push(find_match(match_id)['description']);
}
-
+ let common_prefix = find_common_prefix_of_all(all_names);
if (common_prefix !== null) {
text += common_prefix + '(';
}
text += find_player(player_id)['name'];
first = false;
}
+ } else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
+ const offense = (filter.type === 'formation_offense');
+ if (offense) {
+ text = 'Offense: ';
+ } else {
+ text = 'Defense: ';
+ }
+
+ let all_names = [];
+ for (const formation_id of filter.elements) {
+ all_names.push(find_formation(formation_id)['name']);
+ }
+ let common_prefix = find_common_prefix_of_all(all_names);
+ if (common_prefix !== null) {
+ text += common_prefix + '(';
+ }
+
+ let first = true;
+ let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
+ for (const formation_id of sorted_formation_id) {
+ if (!first) {
+ text += ', ';
+ }
+ let desc = find_formation(formation_id)['name'];
+ if (common_prefix === null) {
+ text += desc;
+ } else {
+ text += desc.substr(common_prefix.length);
+ }
+ first = false;
+ }
+
+ if (common_prefix !== null) {
+ text += ')';
+ }
}
let text_node = document.createElement('span');
return ret;
}
+function find_common_prefix_of_all(values) {
+ if (values.length < 2) {
+ return null;
+ }
+ let common_prefix = null;
+ for (const desc of values) {
+ if (common_prefix === null) {
+ common_prefix = desc;
+ } else {
+ common_prefix = find_common_prefix(common_prefix, desc);
+ }
+ }
+ if (common_prefix.length >= 3) {
+ return common_prefix;
+ } else {
+ return null;
+ }
+}
+
function find_match(match_id) {
for (const match of global_json['matches']) {
if (match['match_id'] === match_id) {
return null;
}
+function find_formation(formation_id) {
+ for (const formation of global_json['formations']) {
+ if (formation['formation_id'] === formation_id) {
+ return formation;
+ }
+ }
+ return null;
+}
+
function find_player(player_id) {
for (const player of global_json['players']) {
if (player['player_id'] === player_id) {
return true;
}
-function keep_event(players, filters) {
- for (const filter of filters) {
- if (filter.type === 'player_any') {
- for (const p of Array.from(filter.elements)) {
- if (players[p].on_field_since !== null) {
- return true;
- }
+function filter_passes(players, formations_used_this_point, filter) {
+ if (filter.type === 'player_any') {
+ for (const p of Array.from(filter.elements)) {
+ if (players[p].on_field_since !== null) {
+ return true;
}
- return false;
- } else if (filter.type === 'player_all') {
- for (const p of Array.from(filter.elements)) {
- if (players[p].on_field_since === null) {
- return false;
- }
+ }
+ return false;
+ } else if (filter.type === 'player_all') {
+ for (const p of Array.from(filter.elements)) {
+ if (players[p].on_field_since === null) {
+ return false;
}
- return true;
+ }
+ return true;
+ } else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
+ for (const f of Array.from(filter.elements)) {
+ if (formations_used_this_point.has(f)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ return true;
+}
+
+function keep_event(players, formations_used_this_point, filters) {
+ for (const filter of filters) {
+ if (!filter_passes(players, formations_used_this_point, filter)) {
+ return false;
+ }
+ }
+ return true;
+}
+
+// Heuristic: If we go at least ten seconds without the possession changing
+// or the operator specifying some other formation, we probably play the
+// same formation as the last point.
+function should_reuse_last_formation(events, t) {
+ for (const e of events) {
+ if (e.t <= t) {
+ continue;
+ }
+ if (e.t > t + 10000) {
+ break;
+ }
+ const type = e.type;
+ if (type === 'their_goal' || type === 'goal' ||
+ type === 'set_defense' || type === 'set_offense' ||
+ type === 'throwaway' || type === 'their_throwaway' ||
+ 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;
}
}
return true;
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