X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=ultimate.js;h=0100f6a3b59ed2f1fdda858c5c4ee8efa16be388;hb=7a960fbf75a145f30e34f5f803062d91afb81165;hp=22ff78b42992a5a38c820234f2676b252b47b220;hpb=280e1391ec1d4ea4e498377726d7613874335943;p=pkanalytics

diff --git a/ultimate.js b/ultimate.js
index 22ff78b..0100f6a 100644
--- a/ultimate.js
+++ b/ultimate.js
@@ -164,6 +164,7 @@ function process_matches(json, filters) {
 			'num_throws': 0,
 			'throwaways': 0,
 			'drops': 0,
+			'was_ds': 0,
 
 			'defenses': 0,
 			'interceptions': 0,
@@ -392,7 +393,7 @@ function process_matches(json, filters) {
 
 			// 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;
@@ -506,6 +507,9 @@ function process_matches(json, filters) {
 			} else if (type === 'drop') {
 				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') {
 				if (keep) ++p.defenses;
 			} else if (type === 'interception') {
@@ -521,7 +525,7 @@ function process_matches(json, filters) {
 			} 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 !== 'formation_offense' && type !== 'formation_defense') {
@@ -728,7 +732,7 @@ function make_table_general(players) {
 	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);
@@ -770,6 +774,7 @@ 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, 'Soft +/-', 6);
 		rows.push(header);
@@ -779,10 +784,11 @@ function make_table_offense(players) {
 	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';
@@ -801,6 +807,7 @@ 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.offensive_soft_plus);
 		add_3cell(row, '-' + p.offensive_soft_minus);
@@ -810,11 +817,12 @@ function make_table_offense(players) {
 		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;
@@ -830,6 +838,7 @@ 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, '');
 	add_3cell(row, '');