]> git.sesse.net Git - pkanalytics/blobdiff - ultimate.js
Reduce reliance on global_filters, to prepare for multiple filtersets.
[pkanalytics] / ultimate.js
index c0ca1bac2ee062b47680c4961c497db4eedfe97f..907023aedc09cc18cc21a6bc0a1297b11cfa6c64 100644 (file)
@@ -175,6 +175,7 @@ function process_matches(json, filters) {
        for (const player of json['players']) {
                players[player['player_id']] = {
                        'name': player['name'],
+                       'gender': player['gender'],
                        'number': player['number'],
 
                        'goals': 0,
@@ -1096,15 +1097,16 @@ function open_filter_menu() {
        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(menu, 5, 'starting_on', 'Starting on');
+       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));
@@ -1116,13 +1118,49 @@ 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(filterset, menu_idx, null, filter_type); });
 }
 
-function show_submenu(menu_idx, pill, 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(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') {
@@ -1174,6 +1212,13 @@ function show_submenu(menu_idx, pill, filter_type) {
                        '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) {
@@ -1188,7 +1233,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(filterset, e, filter_type, choice.id); });
 
                subitem.appendChild(check);
                subitem.appendChild(document.createTextNode(choice.title));
@@ -1212,8 +1257,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;
                }
@@ -1221,8 +1266,19 @@ 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 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) {
@@ -1230,12 +1286,12 @@ function checkbox_changed(e, filter_type, id) {
                                '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;
                }
@@ -1243,9 +1299,9 @@ function checkbox_changed(e, filter_type, id) {
                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;
                }
@@ -1254,7 +1310,7 @@ function checkbox_changed(e, filter_type, id) {
        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;
@@ -1355,11 +1411,22 @@ function make_filter_pill(filter) {
                } 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(' '));
@@ -1369,7 +1436,7 @@ function make_filter_pill(filter) {
        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');
@@ -1461,6 +1528,46 @@ function keep_match(match_id, filters) {
        return true;
 }
 
+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)) {
@@ -1485,6 +1592,8 @@ function filter_passes(players, formations_used_this_point, last_pull_was_ours,
                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;
 }