for (const player of json['players']) {
players[player['player_id']] = {
'name': player['name'],
+ 'gender': player['gender'],
'number': player['number'],
'goals': 0,
'stallouts': 0,
'defenses': 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') {
}
// 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) {
}
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' &&
}
// 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) {
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);
}
} 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;
menu.style.left = rect.left + 'px';
menu.style.top = (rect.bottom + 10) + 'px';
- 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, 3, 'formation_offense', 'Offense played (any)');
- add_menu_item(menu, 4, 'formation_defense', 'Defense played (any)');
+ add_menu_item(global_filters, menu, 0, 'match', 'Match (any)');
+ add_menu_item(global_filters, menu, 1, 'player_any', 'Player on field (any)');
+ add_menu_item(global_filters, menu, 2, 'player_all', 'Player on field (all)');
+ add_menu_item(global_filters, menu, 3, 'formation_offense', 'Offense played (any)');
+ add_menu_item(global_filters, menu, 4, 'formation_defense', 'Defense played (any)');
+ add_menu_item(global_filters, menu, 5, 'starting_on', 'Starting on');
+ add_menu_item(global_filters, menu, 6, 'gender_ratio', 'Gender ratio');
}
-function add_menu_item(menu, menu_idx, filter_type, title) {
+function add_menu_item(filterset, menu, menu_idx, filter_type, title) {
let item = document.createElement('div');
item.classList.add('option');
item.appendChild(document.createTextNode(title));
menu.appendChild(item);
- item.addEventListener('click', (e) => { show_submenu(menu_idx, null, filter_type); });
+ item.addEventListener('click', (e) => { show_submenu(filterset, menu_idx, null, filter_type); });
+}
+
+function find_all_ratios(json)
+{
+ let ratios = {};
+ let players = {};
+ for (const player of json['players']) {
+ players[player['player_id']] = {
+ 'gender': player['gender'],
+ 'last_point_seen': null,
+ };
+ }
+ for (const match of json['matches']) {
+ for (const [q,p] of Object.entries(players)) {
+ p.on_field_since = null;
+ }
+ for (const e of match['events']) {
+ let p = players[e['player']];
+ let type = e['type'];
+ if (type === 'in') {
+ p.on_field_since = 1;
+ } else if (type === 'out') {
+ p.on_field_since = null;
+ } else if (type === 'pull' || type == 'their_pull') { // We assume no cross-gender subs for now.
+ let code = find_gender_ratio_code(players);
+ if (ratios[code] === undefined) {
+ ratios[code] = code;
+ if (code !== '4 F, 3 M' && code !== '4 M, 3 F' && code !== '3 M, 2 F' && code !== '3 F, 2 M') {
+ console.log('Unexpected gender ratio ' + code + ' first seen at: ' +
+ match['description'] + ', ' + format_time(e['t']));
+ }
+ }
+ }
+ }
+ }
+ return ratios;
}
-function show_submenu(menu_idx, pill, filter_type) {
+function show_submenu(filterset, menu_idx, pill, filter_type) {
let submenu = document.getElementById('filter-submenu');
let subitems = [];
- const filter = find_filter(filter_type);
+ const filter = find_filter(filterset, filter_type);
let choices = [];
if (filter_type === 'match') {
});
}
}
+ } 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
+ });
+ } else if (filter_type === 'gender_ratio') {
+ for (const [title, id] of Object.entries(find_all_ratios(global_json)).sort()) {
+ choices.push({
+ 'title': title,
+ 'id': id,
+ });
+ }
}
for (const choice of choices) {
if (filter !== null && filter.elements.has(choice.id)) {
check.setAttribute('checked', 'checked');
}
- check.addEventListener('change', (e) => { checkbox_changed(e, filter_type, choice.id); });
+ check.addEventListener('change', (e) => { checkbox_changed(filterset, e, filter_type, choice.id); });
subitem.appendChild(check);
subitem.appendChild(document.createTextNode(choice.title));
}
// Find the right filter, if it exists.
-function find_filter(filter_type) {
- for (let f of global_filters) {
+function find_filter(filterset, filter_type) {
+ for (let f of filterset) {
if (f.type === filter_type) {
return f;
}
return null;
}
-function checkbox_changed(e, filter_type, id) {
- let filter = find_filter(filter_type);
+// Equivalent to Array.prototype.filter, but in-place.
+function inplace_filter(arr, cond) {
+ let j = 0;
+ for (let i = 0; i < arr.length; ++i) {
+ if (cond(arr[i])) {
+ arr[j++] = arr[i];
+ }
+ }
+ arr.length = j;
+}
+
+function checkbox_changed(filterset, e, filter_type, id) {
+ let filter = find_filter(filterset, filter_type);
if (e.target.checked) {
// See if we must add a new filter to the list.
if (filter === null) {
'type': filter_type,
'elements': new Set([ id ]),
};
- filter.pill = make_filter_pill(filter);
- global_filters.push(filter);
+ filter.pill = make_filter_pill(filterset, filter);
+ filterset.push(filter);
document.getElementById('filters').appendChild(filter.pill);
} else {
filter.elements.add(id);
- let new_pill = make_filter_pill(filter);
+ let new_pill = make_filter_pill(filterset, filter);
document.getElementById('filters').replaceChild(new_pill, filter.pill);
filter.pill = new_pill;
}
filter.elements.delete(id);
if (filter.elements.size === 0) {
document.getElementById('filters').removeChild(filter.pill);
- global_filters = global_filters.filter(f => f !== filter);
+ inplace_filter(filterset, f => f !== filter);
} else {
- let new_pill = make_filter_pill(filter);
+ let new_pill = make_filter_pill(filterset, filter);
document.getElementById('filters').replaceChild(new_pill, filter.pill);
filter.pill = new_pill;
}
process_matches(global_json, global_filters);
}
-function make_filter_pill(filter) {
+function make_filter_pill(filterset, filter) {
let pill = document.createElement('div');
pill.classList.add('filter-pill');
let text;
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';
+ }
+ } else if (filter.type === 'gender_ratio') {
+ text = 'Gender: ';
+
+ let first = true;
+ for (const name of Array.from(filter.elements).sort()) {
+ if (!first) {
+ text += '; ';
+ }
+ text += name;
+ first = false;
+ }
}
let text_node = document.createElement('span');
text_node.innerText = text;
- text_node.addEventListener('click', (e) => show_submenu(null, pill, filter.type));
+ text_node.addEventListener('click', (e) => show_submenu(filterset, null, pill, filter.type));
pill.appendChild(text_node);
pill.appendChild(document.createTextNode(' '));
delete_node.addEventListener('click', (e) => {
// Delete this filter entirely.
document.getElementById('filters').removeChild(pill);
- global_filters = global_filters.filter(f => f !== filter);
+ inplace_filter(filterset, f => f !== filter);
process_matches(global_json, global_filters);
let add_menu = document.getElementById('filter-add-menu');
return true;
}
-function filter_passes(players, formations_used_this_point, filter) {
+function find_gender_ratio_code(players) {
+ let map = {};
+ for (const [q,p] of Object.entries(players)) {
+ if (p.on_field_since === null) {
+ continue;
+ }
+ let gender = p.gender;
+ if (gender === '' || gender === undefined || gender === null) {
+ gender = '?';
+ }
+ if (map[gender] === undefined) {
+ map[gender] = 1;
+q } else {
+ ++map[gender];
+ }
+ }
+ let all_genders = Array.from(Object.keys(map)).sort(
+ (a,b) => {
+ if (map[a] !== map[b]) {
+ return map[b] - map[a]; // Reverse numeric.
+ } else if (a < b) {
+ return -1;
+ } else if (a > b) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+ let code = '';
+ for (const g of all_genders) {
+ if (code !== '') {
+ code += ', ';
+ }
+ code += map[g];
+ code += ' ';
+ code += g;
+ }
+ return code;
+}
+
+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);
+ } else if (filter.type === 'gender_ratio') {
+ return filter.elements.has(find_gender_ratio_code(players));
}
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;
}
}
projects / pkanalytics / blobdiff