}
}
-function take_off_field(player, t, live_since, offense) {
- if (live_since === null) {
- // Play isn't live, so nothing to do.
- } else {
- attribute_player_time(player, t, live_since, offense);
- }
- if (player.on_field_since !== null) { // Just a safeguard; out without in should never happen.
- player.field_time_ms += t - player.on_field_since;
+function take_off_field(player, t, live_since, offense, keep) {
+ if (keep) {
+ if (live_since === null) {
+ // Play isn't live, so nothing to do.
+ } else {
+ attribute_player_time(player, t, live_since, offense);
+ }
+ if (player.on_field_since !== null) { // Just a safeguard; out without in should never happen.
+ player.field_time_ms += t - player.on_field_since;
+ }
}
player.on_field_since = null;
}
'num_throws': 0,
'throwaways': 0,
'drops': 0,
+ 'was_ds': 0,
'defenses': 0,
'interceptions': 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;
}
for (const e of match['events']) {
- // TODO: filter events
-
let t = e['t'];
let type = e['type'];
let p = players[e['player']];
// Sub management
+ 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, 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).
+ for (const [q,p2] of Object.entries(players)) {
+ if (p2.on_field_since !== null) {
+ p2.on_field_since = t;
+ }
+ }
+ }
} else if (type === 'out') {
- take_off_field(p, t, live_since, offense);
+ take_off_field(p, t, live_since, offense, keep);
+ 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.
+ //
+ // TODO: We also need to take care of this to get the globals right.
+ for (const [q,p2] of Object.entries(players)) {
+ if (p2.on_field_since !== null) {
+ take_off_field(p2, t, live_since, offense, keep);
+ p2.on_field_since = t;
+ }
+ }
+ }
}
+ keep = keep_event(players, formations_used_this_point, filters); // Recompute after in/out.
+
// Liveness management
if (type === 'pull' || type === 'their_pull' || type === 'restart') {
live_since = t;
continue;
}
if (type !== 'stoppage' && p.last_point_seen !== point_num) {
- // In case the player did nothing this point,
- // not even subbing in.
- p.last_point_seen = point_num;
- ++p.points_played;
+ if (keep) {
+ // In case the player did nothing this point,
+ // not even subbing in.
+ p.last_point_seen = point_num;
+ ++p.points_played;
+ }
}
- attribute_player_time(p, t, live_since, offense);
+ if (keep) attribute_player_time(p, t, live_since, offense);
if (type !== 'stoppage') {
+ if (keep) {
+ if (last_pull_was_ours === true) { // D point.
+ ++p.defensive_points_completed;
+ if (type === 'goal') {
+ ++p.defensive_points_won;
+ }
+ } else if (last_pull_was_ours === false) { // O point.
+ ++p.offensive_points_completed;
+ if (type === 'goal') {
+ ++p.offensive_points_won;
+ }
+ }
+ }
+ }
+ }
+
+ if (keep) {
+ if (type !== 'stoppage') {
+ // Update globals.
+ ++globals.points_played;
if (last_pull_was_ours === true) { // D point.
- ++p.defensive_points_completed;
+ ++globals.defensive_points_completed;
if (type === 'goal') {
- ++p.defensive_points_won;
+ ++globals.defensive_points_won;
}
} else if (last_pull_was_ours === false) { // O point.
- ++p.offensive_points_completed;
+ ++globals.offensive_points_completed;
if (type === 'goal') {
- ++p.offensive_points_won;
+ ++globals.offensive_points_won;
}
}
}
- }
-
- if (type !== 'stoppage') {
- // Update globals.
- ++globals.points_played;
- if (last_pull_was_ours === true) { // D point.
- ++globals.defensive_points_completed;
- if (type === 'goal') {
- ++globals.defensive_points_won;
+ if (live_since !== null) {
+ globals.playing_time_ms += t - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += t - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += t - live_since;
}
- } else if (last_pull_was_ours === false) { // O point.
- ++globals.offensive_points_completed;
- if (type === 'goal') {
- ++globals.offensive_points_won;
- }
- }
- }
- if (live_since !== null) {
- globals.playing_time_ms += t - live_since;
- if (offense === true) {
- globals.offensive_playing_time_ms += t - live_since;
- } else if (offense === false) {
- globals.defensive_playing_time_ms += t - live_since;
}
}
// Point count management
if (p !== undefined && type !== 'out' && p.last_point_seen !== point_num) {
- p.last_point_seen = point_num;
- ++p.points_played;
+ if (keep) {
+ p.last_point_seen = point_num;
+ ++p.points_played;
+ }
}
if (type === 'goal' || type === 'their_goal') {
++point_num;
if (type === 'pull') {
puller = e['player'];
pull_started = t;
- ++p.pulls;
+ if (keep) ++p.pulls;
} else if (type === 'in' || type === 'out' || type === 'stoppage' || type === 'restart' || type === 'unknown' || type === 'set_defense' || type === 'set_offense') {
// No effect on pull.
} else if (type === 'pull_landed' && puller !== null) {
- players[puller].pull_times.push(t - pull_started);
+ if (keep) players[puller].pull_times.push(t - pull_started);
} else if (type === 'pull_oob' && puller !== null) {
- ++players[puller].oob_pulls;
+ if (keep) ++players[puller].oob_pulls;
} else {
// Not pulling (if there was one, we never recorded its outcome, but still count it).
puller = pull_started = null;
// 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;
if (last_offense !== offense && live_since !== null) {
// Switched offense/defense status, so attribute this drive as needed,
// and update live_since to take that into account.
- for (const [q,p] of Object.entries(players)) {
- if (p.on_field_since === null) {
- continue;
+ if (keep) {
+ for (const [q,p] of Object.entries(players)) {
+ if (p.on_field_since === null) {
+ continue;
+ }
+ attribute_player_time(p, t, live_since, last_offense);
+ }
+ globals.playing_time_ms += t - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += t - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += t - live_since;
}
- attribute_player_time(p, t, live_since, last_offense);
- }
- globals.playing_time_ms += t - live_since;
- if (offense === true) {
- globals.offensive_playing_time_ms += t - live_since;
- } else if (offense === false) {
- globals.defensive_playing_time_ms += t - live_since;
}
live_since = t;
}
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);
+ }
+ }
+ }
+
// Event management
if (type === 'catch' || type === 'goal') {
if (handler !== null) {
- ++players[handler].num_throws;
- ++p.catches;
+ if (keep) {
+ ++players[handler].num_throws;
+ ++p.catches;
+ }
}
- ++p.touches;
+ if (keep) ++p.touches;
if (type === 'goal') {
- if (prev_handler !== null) {
- ++players[prev_handler].hockey_assists;
- }
- if (handler !== null) {
- ++players[handler].assists;
+ if (keep) {
+ if (prev_handler !== null) {
+ ++players[prev_handler].hockey_assists;
+ }
+ if (handler !== null) {
+ ++players[handler].assists;
+ }
+ ++p.goals;
}
- ++p.goals;
handler = prev_handler = null;
} else {
// Update hold history.
handler = e['player'];
}
} else if (type === 'throwaway') {
- ++p.num_throws;
- ++p.throwaways;
+ if (keep) {
+ ++p.num_throws;
+ ++p.throwaways;
+ }
handler = prev_handler = null;
} else if (type === 'drop') {
- ++p.drops;
+ 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') {
- ++p.defenses;
+ if (keep) ++p.defenses;
} else if (type === 'interception') {
- ++p.interceptions;
- ++p.defenses;
- ++p.touches;
+ if (keep) {
+ ++p.interceptions;
+ ++p.defenses;
+ ++p.touches;
+ }
prev_handler = null;
handler = e['player'];
} else if (type === 'offensive_soft_plus' || type === 'offensive_soft_minus' || type === 'defensive_soft_plus' || type === 'defensive_soft_minus') {
- ++p[type];
+ 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 !== '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.
- for (const [q,p] of Object.entries(players)) {
- if (p.on_field_since !== null && last_goal !== null) {
- p.field_time_ms += last_goal - p.on_field_since;
+ 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) {
+ p.field_time_ms += last_goal - p.on_field_since;
+ }
}
- }
- if (game_started !== null && last_goal !== null) {
- globals.field_time_ms += last_goal - game_started;
- }
- if (live_since !== null && last_goal !== null) {
- globals.playing_time_ms += last_goal - live_since;
- if (offense === true) {
- globals.offensive_playing_time_ms += last_goal - live_since;
- } else if (offense === false) {
- globals.defensive_playing_time_ms += last_goal - live_since;
+ if (game_started !== null && last_goal !== null) {
+ globals.field_time_ms += last_goal - game_started;
+ }
+ if (live_since !== null && last_goal !== null) {
+ globals.playing_time_ms += last_goal - live_since;
+ if (offense === true) {
+ globals.offensive_playing_time_ms += last_goal - live_since;
+ } else if (offense === false) {
+ globals.defensive_playing_time_ms += last_goal - live_since;
+ }
}
}
}
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);
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);
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';
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);
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;
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, '');
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_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 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 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 === 'defense' || type === 'interception' ||
+ type === 'pull' || type === 'pull_landed' || type === 'pull_oob' || type === 'their_pull' ||
+ type === 'formation_offense' || type === 'formation_defense') {
+ return false;
+ }
+ }
+ return true;
+}
+
function possibly_close_menu(e) {
if (e.target.closest('#filter-click-to-add') === null &&
e.target.closest('#filter-add-menu') === null &&
projects / pkanalytics / blobdiff