X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.js;h=6c066bcfac8149330c26a8413b4a7237240a90e2;hb=655991d5951123173cb88509c18eddb9abcd0ef4;hp=22ff78b42992a5a38c820234f2676b252b47b220;hpb=6f24464b7ed7f1bdf3aeb7840a53ecdee7f5c819;p=pkanalytics

diff --git a/ultimate.js b/ultimate.js
index 22ff78b..6c066bc 100644
--- a/ultimate.js
+++ b/ultimate.js
@@ -3,7 +3,8 @@
 // No frameworks, no compilers, no npm, just JavaScript. :-)
 
 let global_json;
-let global_filters = [];
+let global_filters = {};
+let next_filterset_id = 2;  // Arbitrary IDs are fine as long as they never collide.
 
 addEventListener('hashchange', () => { process_matches(global_json, global_filters); });
 addEventListener('click', possibly_close_menu);
@@ -11,6 +12,17 @@ fetch('ultimate.json')
    .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) {
@@ -49,7 +61,17 @@ function add_cell(tr, element_type, text) {
 }
 
 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 {
@@ -94,9 +116,14 @@ function add_3cell_ci(tr, ci) {
 	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);
 	}
+	if (ci.unit !== undefined) {
+		text += ' '+ ci.unit;
+	}
 	let element = add_3cell(tr, text);
 	let to_x = (val) => { return ci_width * (val - ci.min) / (ci.max - ci.min); };
 
@@ -149,11 +176,12 @@ function add_3cell_ci(tr, ci) {
 	element.appendChild(svg);
 }
 
-function process_matches(json, filters) {
+function calc_stats(json, filters) {
 	let players = {};
 	for (const player of json['players']) {
 		players[player['player_id']] = {
 			'name': player['name'],
+			'gender': player['gender'],
 			'number': player['number'],
 
 			'goals': 0,
@@ -164,9 +192,11 @@ function process_matches(json, filters) {
 			'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,
@@ -204,8 +234,23 @@ function process_matches(json, filters) {
 
 		'offensive_points_completed': 0,
 		'offensive_points_won': 0,
+		'clean_holds': 0,
+
 		'defensive_points_completed': 0,
 		'defensive_points_won': 0,
+		'clean_breaks': 0,
+
+		'turnovers_won': 0,
+		'turnovers_lost': 0,
+		'their_clean_holds': 0,
+		'their_clean_breaks': 0,
+
+		'touches_for_turnover': 0,
+		'touches_for_goal': 0,
+		'time_for_turnover': [],
+		'time_for_goal': [],
+		'their_time_for_turnover': [],
+		'their_time_for_goal': [],
 	};
 	let globals = players['globals'];
 
@@ -216,7 +261,9 @@ function process_matches(json, filters) {
 
 		let our_score = 0;
 		let their_score = 0;
+		let between_points = true;
 		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).
@@ -226,6 +273,14 @@ function process_matches(json, filters) {
 		let point_num = 0;
 		let game_started = null;
 		let last_goal = null;
+		let current_predominant_gender = null;
+		let current_num_players_on_field = null;
+
+		let we_lost_disc = false;
+		let they_lost_disc = false;
+		let touches_this_possession = 0;
+		let possession_started = null;
+		let extra_ms_this_possession = 0;  // Used at stoppages.
 
 		// The last used formations of the given kind, if any; they may be reused
 		// when the point starts, if nothing else is set.
@@ -251,10 +306,10 @@ function process_matches(json, filters) {
 			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).
@@ -266,7 +321,7 @@ function process_matches(json, filters) {
 				}
 			} 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.
@@ -281,17 +336,65 @@ function process_matches(json, filters) {
 				}
 			}
 
-			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.
+
+			if (match['gender_rule_a']) {
+				if (type === 'restart' && !between_points) {
+					let predominant_gender = find_predominant_gender(players);
+					let num_players_on_field = find_num_players_on_field(players);
+					if (predominant_gender !== current_predominant_gender && current_predominant_gender !== null) {
+						console.log(match['description'] + ' ' + format_time(t) + ': Stoppage changed predominant gender from ' + current_predominant_gender + ' to ' + predominant_gender);
+					}
+					if (num_players_on_field !== current_num_players_on_field && current_num_players_on_field !== null) {
+						console.log(match['description'] + ' ' + format_time(t) + ': Stoppage changed number of players on field from ' + current_num_players_on_field + ' to ' + num_players_on_field);
+					}
+					current_predominant_gender = predominant_gender;
+					current_num_players_on_field = num_players_on_field;
+				} else if (type === 'pull' || type === 'their_pull') {
+					let predominant_gender = find_predominant_gender(players);
+					let num_players_on_field = find_num_players_on_field(players);
+					let changed = (predominant_gender !== current_predominant_gender);
+					if (point_num !== 0) {
+						let should_change = (point_num % 4 == 1 || point_num % 4 == 3);  // ABBA changes on 1 and 3.
+						if (changed && !should_change) {
+							console.log(match['description'] + ' ' + format_time(t) + ': Gender ratio should have stayed the same, changed to predominance of ' + predominant_gender);
+						} else if (!changed && should_change) {
+							console.log(match['description'] + ' ' + format_time(t) + ': Gender ratio should have changed, remained predominantly ' + predominant_gender);
+						}
+						if (num_players_on_field !== current_num_players_on_field && current_num_players_on_field !== null) {
+							console.log(match['description'] + ' ' + format_time(t) + ': Number of players on field changed from ' + current_num_players_on_field + ' to ' + num_players_on_field);
+						}
+					}
+					current_predominant_gender = predominant_gender;
+					current_num_players_on_field = num_players_on_field;
+				}
+			}
+			if (match['gender_pull_rule']) {
+				if (type === 'pull') {
+					if (current_predominant_gender !== null &&
+					    p.gender !== current_predominant_gender) {
+						console.log(match['description'] + ' ' + format_time(t) + ': ' + p.name + ' pulled, should have been ' + current_predominant_gender);
+					}
+				}
+			}
 
 			// Liveness management
 			if (type === 'pull' || type === 'their_pull' || type === 'restart') {
 				live_since = t;
+				if (type !== 'restart') {
+					between_points = false;
+				}
 			} 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;
+				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;
@@ -390,12 +493,57 @@ function process_matches(json, filters) {
 				puller = pull_started = null;
 			}
 
+			// Stats for clean holds or not (must be done before resetting we_lost_disc etc. below).
+			if (keep) {
+				if (type === 'goal' && !we_lost_disc) {
+					if (last_pull_was_ours === false) {  // O point.
+						++globals.clean_holds;
+					} else if (last_pull_was_ours === true) {
+						++globals.clean_breaks;
+					}
+				} else if (type === 'their_goal' && !they_lost_disc) {
+					if (last_pull_was_ours === true) {  // O point for them.
+						++globals.their_clean_holds;
+					} else if (last_pull_was_ours === false) {
+						++globals.their_clean_breaks;
+					}
+				}
+			}
+
 			// 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;
+				we_lost_disc = true;
+				if (keep && type !== 'goal' && !(type === 'set_defense' && last_pull_was_ours === null)) {
+					++globals.turnovers_lost;
+					globals.touches_for_turnover += touches_this_possession;
+					if (possession_started != null) globals.time_for_turnover.push((t - possession_started) + extra_ms_this_possession);
+				} else if (keep && type === 'goal') {
+					globals.touches_for_goal += touches_this_possession;
+					if (possession_started != null) globals.time_for_goal.push((t - possession_started) + extra_ms_this_possession);
+				}
+				touches_this_possession = 0;
+				possession_started = null;
+				extra_ms_this_possession = 0;
 			} else if (type === 'set_offense' || type === 'their_goal' || type === 'their_throwaway' || type === 'defense' || type === 'interception') {
 				offense = true;
+				they_lost_disc = true;
+				if (keep && type !== 'their_goal' && !(type === 'set_offense' && last_pull_was_ours === null)) {
+					++globals.turnovers_won;
+					if (possession_started != null) globals.their_time_for_turnover.push((t - possession_started) + extra_ms_this_possession);
+				} else if (keep && type === 'their_goal') {
+					if (possession_started != null) globals.their_time_for_goal.push((t - possession_started) + extra_ms_this_possession);
+				}
+				touches_this_possession = 0;
+				possession_started = null;
+				extra_ms_this_possession = 0;
+			}
+			if (type === 'goal' || type === 'their_goal') {
+				between_points = true;
+				we_lost_disc = false;
+				they_lost_disc = false;
+				touches_this_possession = 0;
 			}
 			if (last_offense !== offense && live_since !== null) {
 				// Switched offense/defense status, so attribute this drive as needed,
@@ -416,6 +564,19 @@ function process_matches(json, filters) {
 				}
 				live_since = t;
 			}
+			// The rules for possessions are slightly different; we want to start at pulls,
+			// not previous goals.
+			if ((last_offense !== offense && type !== 'goal' && type !== 'their_goal' && live_since !== null) ||
+			    type === 'pull' || type === 'their_pull') {
+				possession_started = t;
+			} else if (type === 'stoppage') {
+				if (possession_started !== null) {
+					extra_ms_this_possession = t - possession_started;
+					possession_started = null;
+				}
+			} else if (type === 'restart' && live_since !== null && !between_points) {
+				possession_started = t;
+			}
 
 			if (type === 'pull') {
 				last_pull_was_ours = true;
@@ -471,8 +632,31 @@ function process_matches(json, filters) {
 				}
 			}
 
+			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.
+				if (keep) {
+					++p.goals;
+					++p.callahans;
+				}
+				handler = prev_handler = null;
+			} else if (type === 'catch' || type === 'goal') {
 				if (handler !== null) {
 					if (keep) {
 						++players[handler].num_throws;
@@ -481,6 +665,7 @@ function process_matches(json, filters) {
 				}
 
 				if (keep) ++p.touches;
+				++touches_this_possession;
 				if (type === 'goal') {
 					if (keep) {
 						if (prev_handler !== null) {
@@ -496,6 +681,7 @@ function process_matches(json, filters) {
 					// Update hold history.
 					prev_handler = handler;
 					handler = e['player'];
+					handler_got_by_interception = false;
 				}
 			} else if (type === 'throwaway') {
 				if (keep) {
@@ -506,26 +692,34 @@ function process_matches(json, filters) {
 			} 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;
+					++touches_this_possession;
 				}
 				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') {
@@ -534,7 +728,7 @@ function process_matches(json, filters) {
 		}
 
 		// 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) {
@@ -554,23 +748,82 @@ function process_matches(json, filters) {
 			}
 		}
 	}
+	return players;
+}
 
+function process_matches(json, filtersets) {
 	let chosen_category = get_chosen_category();
 	write_main_menu(chosen_category);
 
-	let rows = [];
-	if (chosen_category === 'general') {
-		rows = make_table_general(players);
-	} else if (chosen_category === 'offense') {
-		rows = make_table_offense(players);
-	} else if (chosen_category === 'defense') {
-		rows = make_table_defense(players);
-	} else if (chosen_category === 'playing_time') {
-		rows = make_table_playing_time(players);
-	} else if (chosen_category === 'per_point') {
-		rows = make_table_per_point(players);
-	}
-	document.getElementById('stats').replaceChildren(...rows);
+	let filterset_values = Object.values(filtersets);
+	if (filterset_values.length === 0) {
+		filterset_values = [[]];
+	}
+
+	let rowsets = [];
+	for (const filter of filterset_values) {
+		let players = calc_stats(json, filter);
+		let rows = [];
+		if (chosen_category === 'general') {
+			rows = make_table_general(players);
+		} else if (chosen_category === 'offense') {
+			rows = make_table_offense(players);
+		} else if (chosen_category === 'defense') {
+			rows = make_table_defense(players);
+		} else if (chosen_category === 'playing_time') {
+			rows = make_table_playing_time(players);
+		} else if (chosen_category === 'per_point') {
+			rows = make_table_per_point(players);
+		} else if (chosen_category === 'team_wide') {
+			rows = make_table_team_wide(players);
+		}
+		rowsets.push(rows);
+	}
+
+	let merged_rows = [];
+	if (filterset_values.length > 1) {
+		for (let i = 0; i < rowsets.length; ++i) {
+			let marker = make_filter_marker(filterset_values[i]);
+
+			// Make filter header.
+			let tr = rowsets[i][0];
+			let th = document.createElement('th');
+			th.textContent = '';
+			tr.insertBefore(th, tr.firstChild);
+
+			for (let j = 1; j < rowsets[i].length; ++j) {
+				let tr = rowsets[i][j];
+
+				// Remove the name for cleanness.
+				if (i != 0) {
+					tr.firstChild.nextSibling.textContent = '';
+				}
+
+				if (i != 0) {
+					tr.style.borderTop = '0px';
+				}
+				if (i != rowsets.length - 1) {
+					tr.style.borderBottom = '0px';
+				}
+
+				// Make filter marker.
+				let td = document.createElement('td');
+				td.textContent = marker;
+				td.classList.add('filtermarker');
+				tr.insertBefore(td, tr.firstChild);
+			}
+		}
+
+		for (let i = 0; i < rowsets[0].length; ++i) {
+			for (let j = 0; j < rowsets.length; ++j) {
+				merged_rows.push(rowsets[j][i]);
+				if (i === 0) break;  // Don't merge the headings.
+			}
+		}
+	} else {
+		merged_rows = rowsets[0];
+	}
+	document.getElementById('stats').replaceChildren(...merged_rows);
 }
 
 function get_chosen_category() {
@@ -582,6 +835,8 @@ function get_chosen_category() {
 		return 'playing_time';
 	} else if (window.location.hash === '#per_point') {
 		return 'per_point';
+	} else if (window.location.hash === '#team_wide') {
+		return 'team_wide';
 	} else {
 		return 'general';
 	}
@@ -589,59 +844,25 @@ function get_chosen_category() {
 
 function write_main_menu(chosen_category) {
 	let elems = [];
-	if (chosen_category === 'general') {
-		let span = document.createElement('span');
-		span.innerText = 'General';
-		elems.push(span);
-	} else {
-		let a = document.createElement('a');
-		a.appendChild(document.createTextNode('General'));
-		a.setAttribute('href', '#general');
-		elems.push(a);
-	}
-
-	if (chosen_category === 'offense') {
-		let span = document.createElement('span');
-		span.innerText = 'Offense';
-		elems.push(span);
-	} else {
-		let a = document.createElement('a');
-		a.appendChild(document.createTextNode('Offense'));
-		a.setAttribute('href', '#offense');
-		elems.push(a);
-	}
-
-	if (chosen_category === 'defense') {
-		let span = document.createElement('span');
-		span.innerText = 'Defense';
-		elems.push(span);
-	} else {
-		let a = document.createElement('a');
-		a.appendChild(document.createTextNode('Defense'));
-		a.setAttribute('href', '#defense');
-		elems.push(a);
-	}
-
-	if (chosen_category === 'playing_time') {
-		let span = document.createElement('span');
-		span.innerText = 'Playing time';
-		elems.push(span);
-	} else {
-		let a = document.createElement('a');
-		a.appendChild(document.createTextNode('Playing time'));
-		a.setAttribute('href', '#playing_time');
-		elems.push(a);
-	}
-
-	if (chosen_category === 'per_point') {
-		let span = document.createElement('span');
-		span.innerText = 'Per point';
-		elems.push(span);
-	} else {
-		let a = document.createElement('a');
-		a.appendChild(document.createTextNode('Per point'));
-		a.setAttribute('href', '#per_point');
-		elems.push(a);
+	const categories = [
+		['general', 'General'],
+		['offense', 'Offense'],
+		['defense', 'Defense'],
+		['playing_time', 'Playing time'],
+		['per_point', 'Per point'],
+		['team_wide', 'Team-wide'],
+	];
+	for (const [id, title] of categories) {
+		if (chosen_category === id) {
+			let span = document.createElement('span');
+			span.innerText = title;
+			elems.push(span);
+		} else {
+			let a = document.createElement('a');
+			a.appendChild(document.createTextNode(title));
+			a.setAttribute('href', '#' + id);
+			elems.push(a);
+		}
 	}
 
 	document.getElementById('mainmenu').replaceChildren(...elems);
@@ -691,6 +912,8 @@ function make_efficiency_ci(points_won, points_completed, z)
 //
 // Modified Wald (recommended by http://www.ine.pt/revstat/pdf/rs120203.pdf
 // since our rates are definitely below 2 per point).
+//
+// FIXME: z is ignored.
 function make_poisson_ci(val, num, z, inverted)
 {
 	let low  = (val == 0) ? 0.0 : ((val - 0.5) - Math.sqrt(val - 0.5)) / num;
@@ -699,19 +922,88 @@ function make_poisson_ci(val, num, z, inverted)
 	// Fix the signs so that we don't get -0.00.
 	low = Math.max(low, 0.0);
 
-	// The display range of 0 to 0.25 is fairly arbitrary. So is the desired 0.05 per point.
+	// The display range of 0 to 0.5 is fairly arbitrary. So is the desired 0.05 per point.
 	let avg = val / num;
 	return {
 		'val': avg,
 		'lower_ci': low,
 		'upper_ci': high,
 		'min': 0.0,
-		'max': 0.25,
+		'max': 0.5,
 		'desired': 0.05,
 		'inverted': inverted,
 	};
 }
 
+// Wilson and Hilferty, again recommended for general use in the PDF above
+// (anything from their group “G1” works).
+// https://en.wikipedia.org/wiki/Poisson_distribution#Confidence_interval
+function make_poisson_ci_large(val, num, z)
+{
+	let low  = val * Math.pow(1.0 - 1.0 / (9.0 * val) - z / (3.0 * Math.sqrt(val)), 3.0) / num;
+	let high = (val + 1.0) * Math.pow(1.0 - 1.0 / (9.0 * (val + 1.0)) + z / (3.0 * Math.sqrt(val + 1.0)), 3.0) / num;
+
+	// Fix the signs so that we don't get -0.00.
+	low = Math.max(low, 0.0);
+
+	// The display range of 0 to 25.0 is fairly arbitrary. We have no desire here
+	// (this is used for number of touches).
+	let avg = val / num;
+	return {
+		'val': avg,
+		'lower_ci': low,
+		'upper_ci': high,
+		'min': 0.0,
+		'max': 25.0,
+		'desired': 0.0,
+		'inverted': false,
+	};
+}
+
+// We don't really know what to expect for possessions; it appears roughly
+// lognormal, but my head doesn't work well enough to extract the CI for
+// the estimated sample mean, and now my head spins around whether we do
+// this correctly even for Poisson :-) But we do a simple (non-BCa) bootstrap
+// here, which should give us what we want.
+//
+// FIXME: z is ignored.
+function make_ci_duration(vals, z)
+{
+	// Bootstrap.
+	let sample_means = [];
+	for (let i = 0; i < 300; ++i) {
+		let sum = 0.0;
+		for (let j = 0; j < vals.length; ++j) {
+			sum += vals[Math.floor(Math.random() * vals.length)];
+		}
+		sample_means.push(sum / vals.length);
+	}
+	sample_means.sort();
+
+	// Interpolating here would probably be better, but OK.
+	let low  = sample_means[Math.floor(0.025 * sample_means.length)];
+	let high = sample_means[Math.floor(0.975 * sample_means.length)];
+
+	// Find the point estimate of the mean.
+	let sum = 0.0;
+	for (const v of vals) {
+		sum += v;
+	}
+	let avg = sum / vals.length;
+
+	return {
+		'val': avg / 1000.0,
+		'lower_ci': low / 1000.0,
+		'upper_ci': high / 1000.0,
+		'min': 0.0,
+		'max': 120.0,
+		'desired': 0.0,
+		'inverted': false,
+		'unit': 'sec',
+		'decimals': 1,
+	};
+}
+
 function make_table_general(players) {
 	let rows = [];
 	{
@@ -725,19 +1017,20 @@ function make_table_general(players) {
 		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);
 	}
 
@@ -757,6 +1050,129 @@ function make_table_general(players) {
 	return rows;
 }
 
+function make_table_team_wide(players) {
+	let globals = players['globals'];
+
+	let rows = [];
+	{
+		let header = document.createElement('tr');
+		add_th(header, '');
+		add_th(header, 'Our team', 6);
+		add_th(header, 'Opponents', 6);
+		rows.push(header);
+	}
+
+	// Turnovers.
+	{
+		let row = document.createElement('tr');
+		let name = add_3cell(row, 'Turnovers generated', 'name');
+		add_3cell(row, globals.turnovers_won);
+		add_3cell(row, '');
+		add_3cell(row, globals.turnovers_lost);
+		add_3cell(row, '');
+		rows.push(row);
+	}
+
+	// Clean holds.
+	{
+		let row = document.createElement('tr');
+		let name = add_3cell(row, 'Clean holds', 'name');
+		let our_clean_holds = make_binomial_ci(globals.clean_holds, globals.offensive_points_completed, z);
+		let their_clean_holds = make_binomial_ci(globals.their_clean_holds, globals.defensive_points_completed, z);
+		our_clean_holds.desired = 0.3;  // Arbitrary.
+		our_clean_holds.format = 'percentage';
+		their_clean_holds.desired = 0.3;
+		their_clean_holds.format = 'percentage';
+		add_3cell(row, globals.clean_holds + ' / ' + globals.offensive_points_completed);
+		add_3cell_ci(row, our_clean_holds);
+		add_3cell(row, globals.their_clean_holds + ' / ' + globals.defensive_points_completed);
+		add_3cell_ci(row, their_clean_holds);
+		rows.push(row);
+	}
+
+	// Clean breaks.
+	{
+		let row = document.createElement('tr');
+		let name = add_3cell(row, 'Clean breaks', 'name');
+		let our_clean_breaks = make_binomial_ci(globals.clean_breaks, globals.defensive_points_completed, z);
+		let their_clean_breaks = make_binomial_ci(globals.their_clean_breaks, globals.offensive_points_completed, z);
+		our_clean_breaks.desired = 0.3;  // Arbitrary.
+		our_clean_breaks.format = 'percentage';
+		their_clean_breaks.desired = 0.3;
+		their_clean_breaks.format = 'percentage';
+		add_3cell(row, globals.clean_breaks + ' / ' + globals.defensive_points_completed);
+		add_3cell_ci(row, our_clean_breaks);
+		add_3cell(row, globals.their_clean_breaks + ' / ' + globals.offensive_points_completed);
+		add_3cell_ci(row, their_clean_breaks);
+		rows.push(row);
+	}
+
+	// Touches. We only have information for our team here.
+	{
+		let goals = 0;
+		for (const [q,p] of get_sorted_players(players)) {
+			if (q === 'globals') continue;
+			goals += p.goals;
+		}
+		let row = document.createElement('tr');
+		let name = add_3cell(row, 'Touches per possession (all)', 'name');
+		let touches = globals.touches_for_turnover + globals.touches_for_goal;
+		let possessions = goals + globals.turnovers_lost;
+		add_3cell(row, '');
+		add_3cell_ci(row, make_poisson_ci_large(touches, possessions, z));
+		add_3cell(row, '');
+		add_3cell(row, '');
+		rows.push(row);
+
+		row = document.createElement('tr');
+		add_3cell(row, 'Touches per possession (goals)', 'name');
+		add_3cell(row, '');
+		add_3cell_ci(row, make_poisson_ci_large(globals.touches_for_goal, goals, z));
+		add_3cell(row, '');
+		add_3cell(row, '');
+		rows.push(row);
+
+		row = document.createElement('tr');
+		add_3cell(row, 'Touches per possession (turnovers)', 'name');
+		add_3cell(row, '');
+		add_3cell_ci(row, make_poisson_ci_large(globals.touches_for_turnover, globals.turnovers_lost, z));
+		add_3cell(row, '');
+		add_3cell(row, '');
+		rows.push(row);
+	}
+
+	// Time. Here we have (roughly) for both.
+	{
+		let row = document.createElement('tr');
+		let name = add_3cell(row, 'Time per possession (all)', 'name');
+		let time = globals.time_for_turnover.concat(globals.time_for_goal);
+		let their_time = globals.their_time_for_turnover.concat(globals.their_time_for_goal);
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(time, z));
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(their_time, z));
+		rows.push(row);
+
+		row = document.createElement('tr');
+		add_3cell(row, 'Time per possession (goals)', 'name');
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(globals.time_for_goal, z));
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(globals.their_time_for_goal, z));
+		rows.push(row);
+
+		row = document.createElement('tr');
+		add_3cell(row, 'Time per possession (turnovers)', 'name');
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(globals.time_for_turnover, z));
+		add_3cell(row, '');
+		add_3cell_ci(row, make_ci_duration(globals.their_time_for_turnover, z));
+		rows.push(row);
+	}
+
+	return rows;
+}
+
 function make_table_offense(players) {
 	let rows = [];
 	{
@@ -770,19 +1186,24 @@ function make_table_offense(players) {
 		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 goals = 0;
 	let num_throws = 0;
 	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';
@@ -801,20 +1222,26 @@ function make_table_offense(players) {
 		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);
 
+		goals += p.goals;
 		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;
@@ -822,7 +1249,7 @@ function make_table_offense(players) {
 
 	let row = document.createElement('tr');
 	add_3cell(row, '');
-	add_3cell(row, '');
+	add_3cell(row, goals);
 	add_3cell(row, '');
 	add_3cell(row, '');
 	add_3cell(row, num_throws);
@@ -830,7 +1257,9 @@ function make_table_offense(players) {
 	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);
@@ -848,10 +1277,18 @@ function make_table_defense(players) {
 		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)) {
+
+	let defenses = 0;
+	let pulls = 0;
+	let oob_pulls = 0;
+	let sum_sum_time = 0;
+	let callahans = 0;
+
+	for (const [q,p] of get_sorted_players(players)) {
 		if (q === 'globals') continue;
 		let sum_time = 0;
 		for (const t of p.pull_times) {
@@ -876,10 +1313,44 @@ function make_table_defense(players) {
 		} 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);
+
+		defenses += p.defenses;
+		pulls += p.pulls;
+		oob_pulls += p.oob_pulls;
+		sum_sum_time += sum_time;
+		callahans += p.callahans;
+	}
+
+	// Globals.
+	let ci_oob = make_binomial_ci(oob_pulls, pulls, z);
+	ci_oob.format = 'percentage';
+	ci_oob.desired = 0.2;  // Arbitrary.
+	ci_oob.inverted = true;
+
+	let avg_time = 1e-3 * sum_sum_time / (pulls - oob_pulls);
+	let oob_pct = 100 * oob_pulls / pulls;
+
+	let row = document.createElement('tr');
+	add_3cell(row, '');
+	add_3cell(row, defenses);
+	add_3cell(row, pulls);
+	add_3cell(row, oob_pulls);
+	add_3cell_ci(row, ci_oob);
+	if (pulls > oob_pulls) {
+		add_3cell(row, avg_time.toFixed(1) + ' sec');
+	} else {
+		add_3cell(row, 'N/A');
 	}
+	add_3cell(row, callahans);
+	add_3cell(row, '');
+	add_3cell(row, '');
+	rows.push(row);
+
 	return rows;
 }
 
@@ -898,7 +1369,7 @@ function make_table_playing_time(players) {
 		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?
@@ -909,6 +1380,7 @@ function make_table_playing_time(players) {
 		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);
 	}
 
@@ -938,7 +1410,7 @@ function make_table_per_point(players) {
 		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);
 	}
@@ -948,9 +1420,9 @@ function make_table_per_point(players) {
 	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.
@@ -969,12 +1441,13 @@ function make_table_per_point(players) {
 		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;
@@ -982,7 +1455,7 @@ function make_table_per_point(players) {
 		hockey_assists += p.hockey_assists;
 		defenses += p.defenses;
 		throwaways += p.throwaways;
-		drops += p.drops;
+		receiver_errors += p.drops + p.was_ds;
 		touches += p.touches;
 	}
 
@@ -991,12 +1464,21 @@ function make_table_per_point(players) {
 	let row = document.createElement('tr');
 	add_3cell(row, '');
 	if (globals.points_played > 0) {
-		add_3cell_with_filler_ci(row, goals == 0 ? 0 : (goals / globals.points_played).toFixed(2));
-		add_3cell_with_filler_ci(row, assists == 0 ? 0 : (assists / globals.points_played).toFixed(2));
-		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));
+		let ci_goals = make_binomial_ci(goals, globals.points_played, z);
+		let ci_assists = make_binomial_ci(assists, globals.points_played, z);
+		let ci_hockey_assists = make_binomial_ci(hockey_assists, globals.points_played, z);
+		ci_goals.desired = 0.5;
+		ci_assists.desired = 0.5;
+		ci_hockey_assists.desired = 0.5;
+
+		add_3cell_ci(row, ci_goals);
+		add_3cell_ci(row, ci_assists);
+		add_3cell_ci(row, ci_hockey_assists);
+
+		add_3cell_ci(row, make_poisson_ci(defenses, globals.points_played, z));
+		add_3cell_ci(row, make_poisson_ci(throwaways, globals.points_played, z, true));
+		add_3cell_ci(row, make_poisson_ci(receiver_errors, globals.points_played, z, true));
+
 		add_3cell(row, touches == 0 ? 0 : (touches / globals.points_played).toFixed(2));
 	} else {
 		add_3cell_with_filler_ci(row, 'N/A');
@@ -1012,28 +1494,39 @@ function make_table_per_point(players) {
 	return rows;
 }
 
-function open_filter_menu() {
+function open_filter_menu(click_to_add_div) {
 	document.getElementById('filter-submenu').style.display = 'none';
+	let filter_div = click_to_add_div.parentElement;
+	let filter_id = filter_div.dataset.filterId;
 
 	let menu = document.getElementById('filter-add-menu');
+	menu.parentElement.removeChild(menu);
+	filter_div.appendChild(menu);
 	menu.style.display = 'block';
 	menu.replaceChildren();
 
 	// Place the menu directly under the “click to add” label;
 	// we don't anchor it since that label will move around
 	// and the menu shouldn't.
-	let rect = document.getElementById('filter-click-to-add').getBoundingClientRect();
+	let rect = click_to_add_div.getBoundingClientRect();
 	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)');
+	let filterset = global_filters[filter_id];
+	if (filterset === undefined) {
+		global_filters[filter_id] = filterset = [];
+	}
+
+	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');
 }
 
-function add_menu_item(menu, menu_idx, filter_type, title) {
+function add_menu_item(filter_div, filterset, menu, menu_idx, filter_type, title) {
 	let item = document.createElement('div');
 	item.classList.add('option');
 	item.appendChild(document.createTextNode(title));
@@ -1045,13 +1538,54 @@ function add_menu_item(menu, menu_idx, filter_type, title) {
 
 	menu.appendChild(item);
 
-	item.addEventListener('click', (e) => { show_submenu(menu_idx, null, filter_type); });
+	item.addEventListener('click', (e) => { show_submenu(filter_div, 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(filter_div, filterset, menu_idx, pill, filter_type) {
 	let submenu = document.getElementById('filter-submenu');
+
+	// Move to the same place as the top-level menu.
+	submenu.parentElement.removeChild(submenu);
+	document.getElementById('filter-add-menu').parentElement.appendChild(submenu);
+
 	let subitems = [];
-	const filter = find_filter(filter_type);
+	const filter = find_filter(filterset, filter_type);
 
 	let choices = [];
 	if (filter_type === 'match') {
@@ -1094,6 +1628,22 @@ function show_submenu(menu_idx, pill, filter_type) {
 				});
 			}
 		}
+	} 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) {
@@ -1108,7 +1658,7 @@ function show_submenu(menu_idx, pill, filter_type) {
 		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(filter_div, filterset, e, filter_type, choice.id); });
 
 		subitem.appendChild(check);
 		subitem.appendChild(document.createTextNode(choice.title));
@@ -1132,8 +1682,8 @@ function show_submenu(menu_idx, pill, filter_type) {
 }
 
 // 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;
 		}
@@ -1141,32 +1691,114 @@ function find_filter(filter_type) {
 	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 add_new_filterset() {
+	let template = document.querySelector('.filter');  // First one is fine.
+	let div = template.cloneNode(true);
+	let add_menu = div.querySelector('#filter-add-menu');
+	if (add_menu !== null) {
+		div.removeChild(add_menu);
+	}
+	let submenu = div.querySelector('#filter-submenu');
+	if (submenu !== null) {
+		div.removeChild(submenu);
+	}
+	div.querySelector('.filters').replaceChildren();
+	div.dataset.filterId = next_filterset_id++;
+	template.parentElement.appendChild(div);
+}
+
+function try_gc_filter_menus(cheap) {
+	let empties = [];
+	let divs = [];
+	for (const filter_div of document.querySelectorAll('.filter')) {
+		let id = filter_div.dataset.filterId;
+		divs.push(filter_div);
+		empties.push(global_filters[id] === undefined || global_filters[id].length === 0);
+	}
+	let last_div = divs[empties.length - 1];
+	if (cheap) {
+		// See if we have two empty filter lists at the bottom of the list;
+		// if so, we can remove one without it looking funny in the UI.
+		// If not, we'll have to wait until closing the menu.
+		// (The menu is positioned at the second-last one, so we can
+		// remove the last one without issue.)
+		if (empties.length >= 2 && empties[empties.length - 2] && empties[empties.length - 1]) {
+			delete global_filters[last_div.dataset.filterId];
+			last_div.parentElement.removeChild(last_div);
+		}
+	} else {
+		// This is a different situation from try_cheap_gc(), where we should
+		// remove the one _not_ last. We might need to move the menu to the last one,
+		// though, so it doesn't get lost.
+		for (let i = 0; i < empties.length - 1; ++i) {
+			if (!empties[i]) {
+				continue;
+			}
+			let div = divs[i];
+			delete global_filters[div.dataset.filterId];
+			let add_menu = div.querySelector('#filter-add-menu');
+			if (add_menu !== null) {
+				div.removeChild(add_menu);
+				last_div.appendChild(add_menu);
+			}
+			let submenu = div.querySelector('#filter-submenu');
+			if (submenu !== null) {
+				div.removeChild(submenu);
+				last_div.appendChild(submenu);
+			}
+			div.parentElement.removeChild(div);
+		}
+	}
+}
+
+function checkbox_changed(filter_div, filterset, e, filter_type, id) {
+	let filter = find_filter(filterset, filter_type);
+	let pills_div = filter_div.querySelector('.filters');
 	if (e.target.checked) {
+		// See if we must create a new empty filterset (since this went from
+		// empty to non-empty).
+		if (filterset.length === 0) {
+			add_new_filterset();
+		}
+
 		// See if we must add a new filter to the list.
 		if (filter === null) {
 			filter = {
 				'type': filter_type,
 				'elements': new Set([ id ]),
 			};
-			filter.pill = make_filter_pill(filter);
-			global_filters.push(filter);
-			document.getElementById('filters').appendChild(filter.pill);
+			filter.pill = make_filter_pill(filter_div, filterset, filter);
+			filterset.push(filter);
+			pills_div.appendChild(filter.pill);
 		} else {
 			filter.elements.add(id);
-			let new_pill = make_filter_pill(filter);
-			document.getElementById('filters').replaceChild(new_pill, filter.pill);
+			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 (filter.elements.size === 0) {
-			document.getElementById('filters').removeChild(filter.pill);
-			global_filters = global_filters.filter(f => f !== filter);
+			pills_div.removeChild(filter.pill);
+			inplace_filter(filterset, f => f !== filter);
+
+			if (filterset.length == 0) {
+				try_gc_filter_menus(true);
+			}
 		} else {
-			let new_pill = make_filter_pill(filter);
-			document.getElementById('filters').replaceChild(new_pill, filter.pill);
+			let new_pill = make_filter_pill(filter_div, filterset, filter);
+			pills_div.replaceChild(new_pill, filter.pill);
 			filter.pill = new_pill;
 		}
 	}
@@ -1174,7 +1806,7 @@ function checkbox_changed(e, filter_type, id) {
 	process_matches(global_json, global_filters);
 }
 
-function make_filter_pill(filter) {
+function make_filter_pill(filter_div, filterset, filter) {
 	let pill = document.createElement('div');
 	pill.classList.add('filter-pill');
 	let text;
@@ -1251,7 +1883,7 @@ function make_filter_pill(filter) {
 		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) {
@@ -1265,11 +1897,32 @@ function make_filter_pill(filter) {
 		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;  // FIXME
+			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(filter_div, filterset, null, pill, filter.type));
 	pill.appendChild(text_node);
 
 	pill.appendChild(document.createTextNode(' '));
@@ -1278,8 +1931,11 @@ function make_filter_pill(filter) {
 	delete_node.innerText = '✖';
 	delete_node.addEventListener('click', (e) => {
 		// Delete this filter entirely.
-		document.getElementById('filters').removeChild(pill);
-		global_filters = global_filters.filter(f => f !== filter);
+		pill.parentElement.removeChild(pill);
+		inplace_filter(filterset, f => f !== filter);
+		if (filterset.length == 0) {
+			try_gc_filter_menus(false);
+		}
 		process_matches(global_json, global_filters);
 
 		let add_menu = document.getElementById('filter-add-menu');
@@ -1293,6 +1949,60 @@ function make_filter_pill(filter) {
 	return pill;
 }
 
+function make_filter_marker(filterset) {
+	let text = '';
+	for (const filter of filterset) {
+		if (text !== '') {
+			text += ',';
+		}
+		if (filter.type === 'match') {
+			let all_names = [];
+			for (const match of global_json['matches']) {
+				all_names.push(match['description']);
+			}
+			let common_prefix = find_common_prefix_of_all(all_names);
+
+			let sorted_match_id = Array.from(filter.elements).sort((a, b) => a - b);
+			for (const match_id of sorted_match_id) {
+				let desc = find_match(match_id)['description'];
+				if (common_prefix === null) {
+					text += desc.substr(0, 3);
+				} else {
+					text += desc.substr(common_prefix.length, 3);
+				}
+			}
+		} else if (filter.type === 'player_any' || filter.type === 'player_all') {
+			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);
+			}
+		} else if (filter.type === 'formation_offense' || filter.type === 'formation_defense') {
+			let sorted_formation_id = Array.from(filter.elements).sort((a, b) => a - b);
+			for (const formation_id of sorted_formation_id) {
+				text += find_formation(formation_id)['name'].substr(0, 3);
+			}
+		} else if (filter.type === 'starting_on') {
+			if (filter.elements.has(false) && filter.elements.has(true)) {
+				// Nothing.
+			} else if (filter.elements.has(false)) {
+				text += 'O';
+			} else {
+				text += 'D';
+			}
+		} else if (filter.type === 'gender_ratio') {
+			let first = true;
+			for (const name of Array.from(filter.elements).sort()) {
+				if (!first) {
+					text += '; ';
+				}
+				text += name.replaceAll(' ', '').substr(0, 2);  // 4 F, 3M -> 4 F.
+				first = false;
+			}
+		}
+	}
+	return text;
+}
+
 function find_common_prefix(a, b) {
 	let ret = '';
 	for (let i = 0; i < Math.min(a.length, b.length); ++i) {
@@ -1371,7 +2081,78 @@ function keep_match(match_id, filters) {
 	return true;
 }
 
-function filter_passes(players, formations_used_this_point, filter) {
+// Returns a map of e.g. F => 4, M => 3.
+function find_gender_ratio(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];
+		}
+	}
+	return map;
+}
+
+function find_gender_ratio_code(players) {
+	let map = find_gender_ratio(players);
+	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;
+}
+
+// null if none (e.g., if playing 3–3).
+function find_predominant_gender(players) {
+	let max = 0;
+	let predominant_gender = null;
+	for (const [gender, num] of Object.entries(find_gender_ratio(players))) {
+		if (num > max) {
+			max = num;
+			predominant_gender = gender;
+		} else if (num == max) {
+			predominant_gender = null;  // At least two have the same.
+		}
+	}
+	return predominant_gender;
+}
+
+function find_num_players_on_field(players) {
+	let num = 0;
+	for (const [q,p] of Object.entries(players)) {
+		if (p.on_field_since !== null) {
+			++num;
+		}
+	}
+	return num;
+}
+
+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) {
@@ -1393,13 +2174,17 @@ function filter_passes(players, formations_used_this_point, filter) {
 			}
 		}
 		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;
 		}
 	}
@@ -1421,7 +2206,7 @@ function should_reuse_last_formation(events, t) {
 		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;
@@ -1431,7 +2216,7 @@ function should_reuse_last_formation(events, t) {
 }
 
 function possibly_close_menu(e) {
-	if (e.target.closest('#filter-click-to-add') === null &&
+	if (e.target.closest('.filter-click-to-add') === null &&
 	    e.target.closest('#filter-add-menu') === null &&
 	    e.target.closest('#filter-submenu') === null &&
 	    e.target.closest('.filter-pill') === null) {
@@ -1439,5 +2224,55 @@ function possibly_close_menu(e) {
 		let add_submenu = document.getElementById('filter-submenu');
 		add_menu.style.display = 'none';
 		add_submenu.style.display = 'none';
+		try_gc_filter_menus(false);
+	}
+}
+
+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;
 }