]> git.sesse.net Git - pkanalytics/commitdiff
Support filtering on formation.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 29 May 2023 22:20:48 +0000 (00:20 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Mon, 29 May 2023 22:20:48 +0000 (00:20 +0200)
ultimate.js

index 2eb282a702d9d0e9652a212b6fb50e261a76ecdd..0655b2fb79a4b7c27796eb04490b37eb96b432e9 100644 (file)
@@ -226,6 +226,21 @@ function process_matches(json, filters) {
                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;
@@ -236,10 +251,10 @@ function process_matches(json, filters) {
                        let p = players[e['player']];
 
                        // Sub management
-                       let keep = keep_event(players, filters);
+                       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, filters)) {
+                               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).
@@ -251,7 +266,7 @@ function process_matches(json, filters) {
                                }
                        } else if (type === 'out') {
                                take_off_field(p, t, live_since, offense, keep);
-                               if (keep && !keep_event(players, filters)) {
+                               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.
@@ -266,7 +281,7 @@ function process_matches(json, filters) {
                                }
                        }
 
-                       keep = keep_event(players, filters);  // Recompute after in/out.
+                       keep = keep_event(players, formations_used_this_point, filters);  // Recompute after in/out.
 
                        // Liveness management
                        if (type === 'pull' || type === 'their_pull' || type === 'restart') {
@@ -422,6 +437,40 @@ function process_matches(json, filters) {
                                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) {
@@ -474,13 +523,18 @@ function process_matches(json, filters) {
                                   type !== 'set_defense' && type !== 'goal' && type !== 'throwaway' &&
                                   type !== 'drop' && 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.
-               const keep = keep_event(players, filters);
+               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) {
@@ -975,7 +1029,8 @@ function open_filter_menu() {
        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) {
@@ -1013,6 +1068,32 @@ function show_submenu(menu_idx, pill, filter_type) {
                                '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) {
@@ -1100,23 +1181,11 @@ function make_filter_pill(filter) {
        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 + '(';
                }
@@ -1161,6 +1230,41 @@ function make_filter_pill(filter) {
                        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');
@@ -1201,6 +1305,25 @@ function find_common_prefix(a, b) {
        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) {
@@ -1210,6 +1333,15 @@ function find_match(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) {
@@ -1239,7 +1371,7 @@ function keep_match(match_id, filters) {
        return true;
 }
 
-function filter_passes(players, filter) {
+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) {
@@ -1254,13 +1386,44 @@ function filter_passes(players, filter) {
                        }
                }
                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, filters) {
+function keep_event(players, formations_used_this_point, filters) {
        for (const filter of filters) {
-               if (!filter_passes(players, filter)) {
+               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;
                }
        }