let text;
if (ci.format === 'percentage') {
text = (100 * ci.val).toFixed(0) + '%';
+ } else if (ci.decimals !== undefined) {
+ text = ci.val.toFixed(ci.decimals);
} else {
text = ci.val.toFixed(2);
}
last_pull_was_ours = !offense;
between_points = false;
} else if (type === 'goal' || type === 'their_goal' || type === 'stoppage') {
- if (type === 'goal') {
- if (keep) ++p.touches;
- ++touches_this_possession;
- }
for (const [q,p] of Object.entries(players)) {
if (p.on_field_since === null) {
continue;
if (type === 'pull') {
puller = e['player'];
pull_started = t;
+ keep = keep_event(players, formations_used_this_point, /*last_pull_was_ours=*/true, filters); // Will change below. This is an ugly hack.
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.
possession_started = t;
}
+ // O/D-point management.
if (type === 'pull') {
last_pull_was_ours = true;
} else if (type === 'their_pull') {
// _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.
- if (keep) {
+ if (keep) { // TODO: keep_pass()?
++p.goals;
++p.callahans;
}
handler = prev_handler = null;
} else if (type === 'catch' || type === 'goal') {
if (handler !== null) {
- if (keep) {
+ if (keep && keep_pass(handler, e['player'], filters)) {
++players[handler].num_throws;
++p.catches;
}
}
- if (keep) ++p.touches;
+ if (keep && keep_pass(handler, e['player'], filters)) ++p.touches;
++touches_this_possession;
if (type === 'goal') {
- if (keep) {
+ if (keep && keep_pass(handler, e['player'], filters)) {
if (prev_handler !== null) {
++players[prev_handler].hockey_assists;
}
handler_got_by_interception = false;
}
} else if (type === 'throwaway') {
- if (keep) {
+ if (keep && keep_pass(e['player'], null, filters)) {
++p.num_throws;
++p.throwaways;
}
handler = prev_handler = null;
} else if (type === 'drop') {
- if (keep) ++p.drops;
+ if (keep && keep_pass(handler, e['player'], filters)) ++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;
+ if (keep && keep_pass(handler, e['player'], filters)) ++p.was_ds;
handler = prev_handler = null;
} else if (type === 'defense') {
if (keep) ++p.defenses;
} else if (type === 'interception') {
- if (keep) {
+ if (keep && keep_pass(null, e['player'], filters)) {
++p.catches;
++p.defenses;
++p.touches;
return players;
}
-function process_matches(json, filtersets) {
+function recursively_expand_filterset(filterset, base, result)
+{
+ if (result.length >= 100) {
+ return;
+ }
+ if (base.length == filterset.length) {
+ result.push(base);
+ return;
+ }
+ let filter = filterset[base.length];
+ if (filter.split) {
+ let elements = filter.elements;
+ if (elements.size === 0) {
+ elements = filter.choices;
+ }
+ for (const element of elements) {
+ let split_filter = {
+ 'type': filter.type,
+ 'elements': new Set([ element ]),
+ 'split': false, // Not used.
+ };
+ recursively_expand_filterset(filterset, [...base, split_filter], result);
+ }
+ } else {
+ recursively_expand_filterset(filterset, [...base, filter], result);
+ }
+}
+
+function expand_filtersets(filtersets) {
+ if (filtersets.length === 0) {
+ return [[]];
+ }
+
+ let expanded = [];
+ for (const filterset of filtersets) {
+ recursively_expand_filterset(filterset, [], expanded);
+ }
+ return expanded;
+}
+
+function process_matches(json, unexpanded_filtersets) {
let chosen_category = get_chosen_category();
write_main_menu(chosen_category);
- let filterset_values = Object.values(filtersets);
- if (filterset_values.length === 0) {
- filterset_values = [[]];
- }
+ let filtersets = expand_filtersets(Object.values(unexpanded_filtersets));
let rowsets = [];
- for (const filter of filterset_values) {
+ for (const filter of filtersets) {
let players = calc_stats(json, filter);
let rows = [];
if (chosen_category === 'general') {
}
let merged_rows = [];
- if (filterset_values.length > 1) {
+ if (filtersets.length > 1) {
for (let i = 0; i < rowsets.length; ++i) {
- let marker = make_filter_marker(filterset_values[i]);
+ let marker = make_filter_marker(filtersets[i]);
// Make filter header.
let tr = rowsets[i][0];
'desired': 0.0,
'inverted': false,
'unit': 'sec',
+ 'decimals': 1,
};
}
add_menu_item(filter_div, filterset, menu, 0, 'match', 'Match (any)');
add_menu_item(filter_div, filterset, menu, 1, 'player_any', 'Player on field (any)');
add_menu_item(filter_div, filterset, menu, 2, 'player_all', 'Player on field (all)');
- add_menu_item(filter_div, filterset, menu, 3, 'formation_offense', 'Offense played (any)');
- add_menu_item(filter_div, filterset, menu, 4, 'formation_defense', 'Defense played (any)');
- add_menu_item(filter_div, filterset, menu, 5, 'starting_on', 'Starting on');
- add_menu_item(filter_div, filterset, menu, 6, 'gender_ratio', 'Gender ratio');
+ add_menu_item(filter_div, filterset, menu, 3, 'thrower', 'Thrower (any)');
+ add_menu_item(filter_div, filterset, menu, 4, 'receiver', 'Receiver (any)');
+ add_menu_item(filter_div, filterset, menu, 5, 'formation_offense', 'Offense played (any)');
+ add_menu_item(filter_div, filterset, menu, 6, 'formation_defense', 'Defense played (any)');
+ add_menu_item(filter_div, filterset, menu, 7, 'starting_on', 'Starting on');
+ add_menu_item(filter_div, filterset, menu, 8, 'gender_ratio', 'Gender ratio');
}
function add_menu_item(filter_div, filterset, menu, menu_idx, filter_type, title) {
'id': match['match_id']
});
}
- } else if (filter_type === 'player_any' || filter_type === 'player_all') {
+ } else if (filter_type === 'player_any' || filter_type === 'player_all' || filter_type === 'thrower' || filter_type === 'receiver') {
for (const player of global_json['players']) {
choices.push({
'title': player['name'],
}
}
+ let choice_set = new Set();
+ for (const choice of choices) {
+ choice_set.add(choice.id);
+ }
+
for (const choice of choices) {
let label = document.createElement('label');
if (filter !== null && filter.elements.has(choice.id)) {
check.setAttribute('checked', 'checked');
}
- check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, choice.id); });
+ check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, choice.id, choice_set); });
subitem.appendChild(check);
subitem.appendChild(document.createTextNode(choice.title));
label.appendChild(subitem);
subitems.push(label);
}
+
+ // If meaningful (it's not for player_all, since all data for that would be
+ // the same anyway), show the split checkbox.
+ if (choices.length > 1 && filter_type !== 'player_all') {
+ let label = document.createElement('label');
+
+ let subitem = document.createElement('div');
+ subitem.classList.add('option');
+
+ let check = document.createElement('input');
+ check.setAttribute('type', 'checkbox');
+ check.setAttribute('id', 'choice_split');
+ if (filter !== null && filter.split) {
+ check.setAttribute('checked', 'checked');
+ }
+ check.addEventListener('change', (e) => { checkbox_changed(filter_div, filterset, e, filter_type, 'split', choice_set); });
+
+ subitem.appendChild(check);
+ let text_span = document.createElement('span'); // So that we can style its disabling later.
+ text_span.appendChild(document.createTextNode('Split'));
+ subitem.appendChild(text_span);
+ subitem.style.borderTop = '1px solid #ddd';
+
+ label.appendChild(subitem);
+ subitems.push(label);
+ }
+
submenu.replaceChildren(...subitems);
submenu.style.display = 'block';
}
}
-function checkbox_changed(filter_div, filterset, e, filter_type, id) {
+function checkbox_changed(filter_div, filterset, e, filter_type, id, choices) {
let filter = find_filter(filterset, filter_type);
let pills_div = filter_div.querySelector('.filters');
if (e.target.checked) {
if (filter === null) {
filter = {
'type': filter_type,
- 'elements': new Set([ id ]),
+ 'elements': new Set(),
+ 'choices': choices,
+ 'split': false,
};
+ if (id === 'split') {
+ filter.split = true;
+ } else {
+ filter.elements.add(id);
+ }
filter.pill = make_filter_pill(filter_div, filterset, filter);
filterset.push(filter);
pills_div.appendChild(filter.pill);
} else {
- filter.elements.add(id);
+ if (id === 'split') {
+ filter.split = true;
+ } else {
+ filter.elements.add(id);
+ }
let new_pill = make_filter_pill(filter_div, filterset, filter);
pills_div.replaceChild(new_pill, filter.pill);
filter.pill = new_pill;
}
} else {
- filter.elements.delete(id);
+ if (id === 'split') {
+ filter.split = false;
+ } else {
+ filter.elements.delete(id);
+ }
if (filter.elements.size === 0) {
pills_div.removeChild(filter.pill);
inplace_filter(filterset, f => f !== filter);
filter.pill = new_pill;
}
}
+ let choice_split = document.getElementById('choice_split');
+ if (filter.elements.size === 1) {
+ choice_split.nextSibling.style.opacity = 0.2;
+ choice_split.setAttribute('disabled', 'disabled');
+ } else {
+ choice_split.nextSibling.style.opacity = 1.0;
+ choice_split.removeAttribute('disabled');
+ }
process_matches(global_json, global_filters);
}
if (common_prefix !== null) {
text += ')';
}
- } else if (filter.type === 'player_any') {
- text = 'Player (any): ';
+ } else if (filter.type === 'player_any' || filter.type === 'thrower' || filter.type === 'receiver') {
+ if (filter.type === 'player_any') {
+ text = 'Player (any): ';
+ } else if (filter.type === 'thrower') {
+ text = 'Thrower (any): ';
+ } else {
+ text = 'Receiver (any): ';
+ }
let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
let first = true;
for (const player_id of sorted_players) {
first = false;
}
}
+ if (filter.split && filter.elements.size !== 1) {
+ text += ' (split)';
+ }
let text_node = document.createElement('span');
text_node.innerText = text;
return pill;
}
+function entire_gender(players) {
+ let gender = null;
+ for (const player_id of players) {
+ if (gender === null) {
+ gender = find_player(player_id).gender;
+ } else if (gender !== find_player(player_id).gender) {
+ return false; // Not all are of the same gender.
+ }
+ }
+ for (const player of global_json['players']) {
+ if (player.gender === gender && !players.has(player.player_id)) {
+ return false; // Not all of this gender are in the group.
+ }
+ }
+ return true;
+}
+
function make_filter_marker(filterset) {
let text = '';
for (const filter of filterset) {
text += desc.substr(common_prefix.length, 3);
}
}
- } else if (filter.type === 'player_any' || filter.type === 'player_all') {
+ } else if (filter.type === 'player_any' || filter.type === 'player_all' || filter.type === 'thrower' || filter.type === 'receiver') {
let sorted_players = Array.from(filter.elements).sort((a, b) => player_pos(a) - player_pos(b));
- for (const player_id of sorted_players) {
- text += find_player(player_id)['name'].substr(0, 3);
+ if (filter.elements.size >= 3 && entire_gender(filter.elements)) {
+ text += find_player(sorted_players[0]).gender;
+ } else {
+ for (const player_id of sorted_players) {
+ text += find_player(player_id)['name'].substr(0, 3);
+ }
}
} else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
} else if (filter.type === 'gender_ratio') {
return filter.elements.has(find_gender_ratio_code(players));
}
+ // NOTE: thrower and receiver uses different state information and applies
+ // to throws only, so will be checked by keep_pass() instead.
return true;
}
return true;
}
+function pass_filter_passes(thrower, receiver, filter) {
+ if (filter.type === 'thrower') {
+ return filter.elements.has(thrower);
+ } else if (filter.type === 'receiver') {
+ return filter.elements.has(receiver);
+ }
+ // The others are tested in keep_event().
+ return true;
+}
+
+function keep_pass(thrower, receiver, filters) {
+ for (const filter of filters) {
+ if (!pass_filter_passes(thrower, receiver, 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.