]> git.sesse.net Git - ultimatescore/blobdiff - carousel.js
Changes for NM 2020 (two groups, no 9th-13th round robin).
[ultimatescore] / carousel.js
index 926579ceb76206f1d1918b668cf92e143c1afbf8..109f21a72f684c2c6cb68ed6ba81e162b73815eb 100644 (file)
@@ -1,5 +1,21 @@
 'use strict';
 
+function jsonclone(x)
+{
+       return JSON.parse(JSON.stringify(x));
+}
+
+// Log with deep clone, so that the browser will show the object at time of log,
+// instead of what it looks like at time of view.
+function dlog()
+{
+       let args = [];
+       for (const arg of arguments) {
+               args.push(jsonclone(arg));
+       }
+       console.log(args);
+}
+
 function addheading(carousel, colspan, content)
 {
        let thead = document.createElement("thead");
@@ -10,24 +26,26 @@ function addheading(carousel, colspan, content)
        tr.appendChild(th);
        thead.appendChild(tr);
        carousel.appendChild(thead);
-};
+}
+
 function addtd(tr, className, content) {
        let td = document.createElement("td");
        td.appendChild(document.createTextNode(content));
        td.className = className;
        tr.appendChild(td);
-};
+}
+
 function addth(tr, className, content) {
        let th = document.createElement("th");
        th.appendChild(document.createTextNode(content));
        th.className = className;
        tr.appendChild(th);
-};
+}
 
-function subrank_partitions(games, parts, start_rank, tiebreakers) {
+function subrank_partitions(games, parts, start_rank, tiebreakers, func) {
        let result = [];
        for (let i = 0; i < parts.length; ++i) {
-               let part = rank(games, parts[i], start_rank, tiebreakers);
+               let part = func(games, parts[i], start_rank, tiebreakers);
                for (let j = 0; j < part.length; ++j) {
                        result.push(part[j]);
                }
@@ -69,11 +87,13 @@ function make_teams_to_idx(teams)
        let teams_to_idx = [];
        for (let i = 0; i < teams.length; i++) {
                teams_to_idx[teams[i].name] = i;
+               teams_to_idx[teams[i].mediumname] = i;
+               teams_to_idx[teams[i].shortname] = i;
        }
        return teams_to_idx;
 }
 
-function partition_by_beat(games, teams)
+function partition_by_beat(teams, fill_beatmatrix)
 {
        // Head-to-head score by way of components. First construct the beat matrix.
        let n = teams.length;
@@ -85,18 +105,7 @@ function partition_by_beat(games, teams)
                        beat[i][j] = 0;
                }
        }
-       for (let i = 0; i < games.length; ++i) {
-               let idx1 = teams_to_idx[games[i].name1];
-               let idx2 = teams_to_idx[games[i].name2];
-               if (idx1 !== undefined && idx2 !== undefined) {
-                       if (games[i].score1 > games[i].score2) {
-                               beat[idx1][idx2] = 1;
-                       }
-                       if (games[i].score1 < games[i].score2) {
-                               beat[idx2][idx1] = 1;
-                       }
-               }
-       }
+       fill_beatmatrix(beat, teams_to_idx);
        // Floyd-Warshall for transitive closure.
        for (let k = 0; k < n; ++k) {
                for (let i = 0; i < n; ++i) {
@@ -135,11 +144,11 @@ function partition_by_beat(games, teams)
                        } 
                        let result = [];
                        if (better_than_pivot.length > 0) {
-                               result = partition_by_beat(games, better_than_pivot);
+                               result = partition_by_beat(better_than_pivot, fill_beatmatrix);
                        }
                        result.push(equal);  // Obviously can't be partitioned further.
                        if (worse_than_pivot.length > 0) {
-                               result = result.concat(partition_by_beat(games, worse_than_pivot));
+                               result = result.concat(partition_by_beat(worse_than_pivot, fill_beatmatrix));
                        }
                        return result;
                }
@@ -161,14 +170,29 @@ function rank(games, teams, start_rank, tiebreakers) {
        // Rule #0: Partition the teams by score.
        let score_parts = partition(teams, function(a, b) { return b.pts - a.pts });
        if (score_parts.length > 1) {
-               return subrank_partitions(games, score_parts, start_rank, tiebreakers);
+               return subrank_partitions(games, score_parts, start_rank, tiebreakers, rank);
        }
 
        // Rule #1: Head-to-head wins.
-       let beat_parts = partition_by_beat(games, teams);
+       let num_relevant_games = 0;
+       let beat_parts = partition_by_beat(teams, function(beat, teams_to_idx) {
+               for (let i = 0; i < games.length; ++i) {
+                       let idx1 = teams_to_idx[games[i].name1];
+                       let idx2 = teams_to_idx[games[i].name2];
+                       if (idx1 !== undefined && idx2 !== undefined) {
+                               if (games[i].score1 > games[i].score2) {
+                                       beat[idx1][idx2] = 1;
+                                       ++num_relevant_games;
+                               } else if (games[i].score1 < games[i].score2) {
+                                       beat[idx2][idx1] = 1;
+                                       ++num_relevant_games;
+                               }
+                       }
+               }
+       });
        if (beat_parts.length > 1) {
                tiebreakers.push(explain_tiebreaker(beat_parts, 'head-to-head'));
-               return subrank_partitions(games, beat_parts, start_rank, tiebreakers);
+               return subrank_partitions(games, beat_parts, start_rank, tiebreakers, rank);
        }
 
        // Rule #2: Number of games played (fewer is better).
@@ -177,54 +201,155 @@ function rank(games, teams, start_rank, tiebreakers) {
        let nplayed_parts = partition(teams, function(a, b) { return a.nplayed - b.nplayed });
        if (nplayed_parts.length > 1) {
                tiebreakers.push(explain_tiebreaker(nplayed_parts, 'fewer losses'));
-               return subrank_partitions(games, nplayed_parts, start_rank, tiebreakers);
+               return subrank_partitions(games, nplayed_parts, start_rank, tiebreakers, rank);
        }
 
-       // Rule #3: Head-to-head goal difference
+       // Rule #3: Head-to-head goal difference (if all have played).
        let teams_to_idx = make_teams_to_idx(teams);
-       for (let i = 0; i < teams.length; i++) {
-               teams[i].h2h_gd = 0;
-               teams[i].h2h_goals = 0;
+       if (num_relevant_games >= teams.length * (teams.length - 1) / 2) {
+               for (let i = 0; i < teams.length; i++) {
+                       teams[i].h2h_gd = 0;
+                       teams[i].h2h_goals = 0;
+               }
+               for (let i = 0; i < games.length; ++i) {
+                       let idx1 = teams_to_idx[games[i].name1];
+                       let idx2 = teams_to_idx[games[i].name2];
+                       if (idx1 !== undefined && idx2 !== undefined &&
+                           !isNaN(games[i].score1) && !isNaN(games[i].score2)) {
+                               teams[idx1].h2h_gd += games[i].score1;
+                               teams[idx1].h2h_gd -= games[i].score2;
+                               teams[idx2].h2h_gd += games[i].score2;
+                               teams[idx2].h2h_gd -= games[i].score1;
+
+                               teams[idx1].h2h_goals += games[i].score1;
+                               teams[idx2].h2h_goals += games[i].score2;
+                       }
+               }
+               let h2h_gd_parts = partition(teams, function(a, b) { return b.h2h_gd - a.h2h_gd });
+               if (h2h_gd_parts.length > 1) {
+                       tiebreakers.push(explain_tiebreaker(h2h_gd_parts, 'head-to-head goal difference'));
+                       return subrank_partitions(games, h2h_gd_parts, start_rank, tiebreakers, rank);
+               }
        }
+
+       // Rule #4: Goal difference against common opponents.
+       var results = {};
        for (let i = 0; i < games.length; ++i) {
-               let idx1 = teams_to_idx[games[i].name1];
-               let idx2 = teams_to_idx[games[i].name2];
-               if (idx1 !== undefined && idx2 !== undefined &&
-                   !isNaN(games[i].score1) && isNaN(games[i].score2)) {
-                       teams[idx1].h2h_gd += games[i].score1;
-                       teams[idx1].h2h_gd -= games[i].score2;
-                       teams[idx2].h2h_gd += games[i].score2;
-                       teams[idx2].h2h_gd -= games[i].score1;
-
-                       teams[idx1].h2h_goals += games[i].score1;
-                       teams[idx2].h2h_goals += games[i].score2;
+               if (results[games[i].name1] === undefined) {
+                       results[games[i].name1] = {};
                }
-       }
-       let h2h_gd_parts = partition(teams, function(a, b) { return b.h2h_gd - a.h2h_gd });
-       if (h2h_gd_parts.length > 1) {
-               tiebreakers.push(explain_tiebreaker(h2h_gd_parts, 'head-to-head goal difference'));
-               return subrank_partitions(games, h2h_gd_parts, start_rank, tiebreakers);
-       }
+               if (results[games[i].name2] === undefined) {
+                       results[games[i].name2] = {};
+               }
+               results[games[i].name1][games[i].name2] = [ games[i].score1, games[i].score2 ];
+               results[games[i].name2][games[i].name1] = [ games[i].score2, games[i].score1 ];
+       }
+       let gd_parts = partition_by_beat(teams, function(beat, teams_to_idx) {
+               for (const team_i of Object.keys(teams_to_idx)) {
+                       let i = teams_to_idx[team_i];
+                       for (const team_j of Object.keys(teams_to_idx)) {
+                               let j = teams_to_idx[team_j];
+                               let results_i = results[team_i], results_j = results[team_j];
+                               let gd_i = 0, gd_j = 0;
+
+                               // See if the two teams have both played a third team k.
+                               for (let k in results_i) {
+                                       if (!results_i.hasOwnProperty(k)) continue;
+                                       if (results_j !== undefined && results_j[k] !== undefined) {
+                                               gd_i += results_i[k][0] - results_i[k][1];
+                                               gd_j += results_j[k][0] - results_j[k][1];
+                                       }
+                               }
 
-       // Rule #4: Global goal difference. (Well, not strictly, but good enough.)
-       let gd_parts = partition(teams, function(a, b) { return b.gd - a.gd });
+                               if (gd_i > gd_j) {
+                                       beat[i][j] = 1;
+                               } else if (gd_i < gd_j) {
+                                       beat[j][i] = 1;
+                               }
+                       }
+               }
+       });
        if (gd_parts.length > 1) {
-               tiebreakers.push(explain_tiebreaker(gd_parts, 'overall goal difference'));
-               return subrank_partitions(games, gd_parts, start_rank, tiebreakers);
+               tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference versus common opponents'));
+               return subrank_partitions(games, gd_parts, start_rank, tiebreakers, rank);
        }
 
-       // Rule #5: Head-to-head scored goals.
-       let h2h_goals_parts = partition(teams, function(a, b) { return b.h2h_goals - a.h2h_goals });
-       if (h2h_goals_parts.length > 1) {
-               tiebreakers.push(explain_tiebreaker(h2h_goals_parts, 'head-to-head scored goals'));
-               return subrank_partitions(games, h2h_goals_parts, start_rank, tiebreakers);
+       // Rule #5: Head-to-head scored goals (if all have played).
+       if (num_relevant_games >= teams.length * (teams.length - 1) / 2) {
+               let h2h_goals_parts = partition(teams, function(a, b) { return b.h2h_goals - a.h2h_goals });
+               if (h2h_goals_parts.length > 1) {
+                       tiebreakers.push(explain_tiebreaker(h2h_goals_parts, 'head-to-head scored goals'));
+                       return subrank_partitions(games, h2h_goals_parts, start_rank, tiebreakers, rank);
+               }
        }
 
-       // Rule #6: Overall scored goals. (Same caveat as #4.)
-       let goals_parts = partition(teams, function(a, b) { return b.goals - a.goals });
+       // Rule #6: Goals scored against common opponents.
+       let goals_parts = partition_by_beat(teams, function(beat, teams_to_idx) {
+               for (const team_i of Object.keys(teams_to_idx)) {
+                       let i = teams_to_idx[team_i];
+                       for (const team_j of Object.keys(teams_to_idx)) {
+                               let j = teams_to_idx[team_j];
+                               let results_i = results[team_i], results_j = results[team_j];
+                               let goals_i = 0, goals_j = 0;
+
+                               // See if the two teams have both played a third team k.
+                               for (let k in results_i) {
+                                       if (!results_i.hasOwnProperty(k)) continue;
+                                       if (results_j !== undefined && results_j[k] !== undefined) {
+                                               goals_i += results_i[k][0];
+                                               goals_j += results_j[k][0];
+                                       }
+                               }
+
+                               if (goals_i > goals_j) {
+                                       beat[i][j] = 1;
+                               } else if (goals_i < goals_j) {
+                                       beat[j][i] = 1;
+                               }
+                       }
+               }
+       });
        if (goals_parts.length > 1) {
-               tiebreakers.push(explain_tiebreaker(goals_parts, 'scored goals'));
-               return subrank_partitions(games, goals_parts, start_rank, tiebreakers);
+               tiebreakers.push(explain_tiebreaker(goals_parts, 'goals scored against common opponents'));
+               return subrank_partitions(games, goals_parts, start_rank, tiebreakers, rank);
+       }
+
+       // OK, it's a tie. Give them all the same rank.
+       let result = [];
+       for (let i = 0; i < teams.length; ++i) {
+               result.push(teams[i]);
+               result[i].rank = start_rank;
+       }
+       return result; 
+}; 
+
+// Same, but with the simplified rules for ranking thirds. games isn't used and can be empty.
+function rank_thirds(games, teams, start_rank, tiebreakers) {
+       if (teams.length <= 1) {
+               // Only one team, so trivial.
+               teams[0].rank = start_rank;
+               return teams;
+       }
+
+       // Rule #1: Partition the teams by score.
+       let score_parts = partition(teams, function(a, b) { return b.pts - a.pts });
+       if (score_parts.length > 1) {
+               tiebreakers.push(explain_tiebreaker(score_parts, 'most games won'));
+               return subrank_partitions(games, score_parts, start_rank, tiebreakers, rank_thirds);
+       }
+
+       // Rule #2: Goal difference against common opponents.
+       let gd_parts = partition(teams, function(a, b) { return b.gd - a.gd });
+       if (gd_parts.length > 1) {
+               tiebreakers.push(explain_tiebreaker(gd_parts, 'goal difference'));
+               return subrank_partitions(games, gd_parts, start_rank, tiebreakers, rank_thirds);
+       }
+       
+       // Rule #3: Goals scored.
+       let goal_parts = partition(teams, function(a, b) { return b.goals - a.goals });
+       if (goal_parts.length > 1) {
+               tiebreakers.push(explain_tiebreaker(goal_parts, 'goals scored'));
+               return subrank_partitions(games, goal_parts, start_rank, tiebreakers, rank_thirds);
        }
 
        // OK, it's a tie. Give them all the same rank.
@@ -243,7 +368,8 @@ function parse_teams_from_spreadsheet(response) {
                        "name": response.values[i][0],
                        "mediumname": response.values[i][1],
                        "shortname": response.values[i][2],
-                       "tags": response.values[i][3],
+                       //"tags": response.values[i][3],
+                       "ngames": 0,
                        "nplayed": 0,
                        "gd": 0,
                        "pts": 0,
@@ -283,18 +409,21 @@ function parse_games_from_spreadsheet(response, group_name, include_unplayed) {
        return games;
 };
 
-function display_group(response, group_name)
-{
-       let teams = parse_teams_from_spreadsheet(response);
-       let games = parse_games_from_spreadsheet(response, group_name, false);
-       display_group_parsed(teams, games, group_name);
-};
-
-function display_group_parsed(teams, games, group_name)
+function apply_games_to_teams(games, teams, ignored_teams, ret_ignored_games)
 {
-       document.getElementById('entire-bug').style.display = 'none';
-
        let teams_to_idx = make_teams_to_idx(teams);
+       let ignored_teams_idx;
+       if (ignored_teams === undefined) {
+               ignored_teams_idx = [];
+       } else {
+               ignored_teams_idx = make_teams_to_idx(ignored_teams);
+       }
+       for (let i = 0; i < teams.length; ++i) {
+               teams[i].nplayed = 0;
+               teams[i].goals = 0;
+               teams[i].gd = 0;
+               teams[i].pts = 0;
+       }
        for (let i = 0; i < games.length; ++i) {
                let idx1 = teams_to_idx[games[i].name1];
                let idx2 = teams_to_idx[games[i].name2];
@@ -304,6 +433,23 @@ function display_group_parsed(teams, games, group_name)
                    games[i].score1 == games[i].score2) {
                        continue;
                }
+
+               let ignored_idx1 = ignored_teams_idx[games[i].name1];
+               let ignored_idx2 = ignored_teams_idx[games[i].name2];
+               if (ignored_idx1 !== undefined || ignored_idx2 !== undefined) {
+                       if (ret_ignored_games !== undefined) {
+                               // Figure out whether the fifth we're ignoring was only picked out arbitrarily
+                               // (ie., there's a tie for 5th); if so, mark it as such.
+                               let arbitrary = false;
+                               if (ignored_idx1 !== undefined && ignored_teams[ignored_idx1].rank < 5) {
+                                       arbitrary = true;
+                               } else if (ignored_idx2 !== undefined && ignored_teams[ignored_idx2].rank < 5) {
+                                       arbitrary = true;
+                               }
+                               ret_ignored_games.push([teams[idx1].shortname, teams[idx2].shortname, arbitrary]);
+                       }
+                       continue;
+               }
                ++teams[idx1].nplayed;
                ++teams[idx2].nplayed;
                teams[idx1].goals += games[i].score1;
@@ -318,14 +464,38 @@ function display_group_parsed(teams, games, group_name)
                        teams[idx2].pts += 2;
                }
        }
+}
 
+// So that we can just have one team list, and let membership be defined by games.
+function filter_teams(teams, response)
+{
+       let teams_to_idx = make_teams_to_idx(teams);
+       let games = parse_games_from_spreadsheet(response, 'irrelevant group name', true);
+       for (let i = 0; i < games.length; ++i) {
+               let idx1 = teams_to_idx[games[i].name1];
+               let idx2 = teams_to_idx[games[i].name2];
+               if (idx1 !== undefined) {
+                       ++teams[idx1].ngames;  // FIXME: shouldn't nplayed be just as good?
+               }
+               if (idx2 !== undefined) {
+                       ++teams[idx2].ngames;
+               }
+       }
+       return teams.filter(function(team) { return team.ngames > 0; });
+}
+
+function display_group_parsed(teams, games, group_name)
+{
+       document.getElementById('entire-bug').style.display = 'none';
+
+       apply_games_to_teams(games, teams);
        let tiebreakers = [];
        teams = rank(games, teams, 1, tiebreakers);
 
        let carousel = document.getElementById('carousel');
        clear_carousel(carousel);
 
-       addheading(carousel, 5, "Current standings, Trøndisk 2017<br />" + group_name);
+       addheading(carousel, 5, "Current standings, " + ultimateconfig['tournament_title'] + "<br />" + group_name);
        let tr = document.createElement("tr");
        tr.className = "subfooter";
        addth(tr, "rank", "");
@@ -361,7 +531,7 @@ function display_group_parsed(teams, games, group_name)
        let footer_tr = document.createElement("tr");
        footer_tr.className = "footer";
        let td = document.createElement("td");
-       td.appendChild(document.createTextNode("www.trondheimfrisbeeklubb.no | #trøndisk"));
+       td.appendChild(document.createTextNode(ultimateconfig['tournament_footer']));
        td.setAttribute("colspan", "5");
        footer_tr.appendChild(td);
        carousel.appendChild(footer_tr);
@@ -403,7 +573,7 @@ function clear_carousel(table)
 };
 
 // Stream schedule
-let max_list_len = 8;
+let max_list_len = 7;
 
 function display_stream_schedule(response, group_name) {
        let teams = parse_teams_from_spreadsheet(response);
@@ -475,7 +645,7 @@ function display_stream_schedule_parsed(teams, games, page) {
        
        let carousel = document.getElementById('carousel');
        clear_carousel(carousel);
-       addheading(carousel, 3, "Stream schedule, Trøndisk 2017<br />" + covered_days.join('/') + " (all times CET)");
+       addheading(carousel, 3, "Stream schedule, " + ultimateconfig['tournament_title'] + "<br />" + covered_days.join('/') + " (all times CET)");
 
        let teams_to_idx = make_teams_to_idx(teams);
        row_num = 0;
@@ -515,19 +685,26 @@ function get_group(group_name, cb)
        req.onload = function(e) {
                cb(JSON.parse(req.responseText), group_name);
        };
-       req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/1CwRHQtpokVMGTPJu2FYYG-6rnG7OfISIcEHwBfXh-Y4/values/\'' + group_name + '\'!A1:J50?key=AIzaSyAuP9yQn8g0bSay6r_RpGtpFeIbwprH1TU');
+       req.open('GET', 'https://sheets.googleapis.com/v4/spreadsheets/' + ultimateconfig['score_sheet_id'] + '/values/\'' + group_name + '\'!A1:J50?key=' + ultimateconfig['api_key']);
        req.send();
-};
+}
 
 function showgroup(group_name)
 {
-       get_group(group_name, display_group);
-};
+       get_group(group_name, function(response, group_name) {
+               let teams = parse_teams_from_spreadsheet(response);
+               let games = parse_games_from_spreadsheet(response, group_name, false);
+               teams = filter_teams(teams, response);
+               display_group_parsed(teams, games, group_name);
+               publish_group_rank(response, group_name);  // Update the spreadsheet in the background.
+       });
+}
+
 
 function showgroup_from_state()
 {
        showgroup(state['group_name']);
-};
+}
 
 let carousel_timeout = null;
 
@@ -540,7 +717,14 @@ function showschedule(page)
 {
        let teams = [];
        let games = [];
-       let num_left = 3;
+       let groups_to_get = [
+               'Group A',
+               'Group B',
+               // 'Group C',
+               // 'Playoffs 9th-13th',
+               'Playoffs'
+       ];
+       let num_left = groups_to_get.length;
 
        let cb = function(response, group_name) {
                teams = teams.concat(parse_teams_from_spreadsheet(response));
@@ -550,9 +734,9 @@ function showschedule(page)
                }
        };
 
-       get_group('Group A', cb);
-       get_group('Group B', cb);
-       get_group('Playoffs', cb);
+       for (const group of groups_to_get) {
+               get_group(group, cb);
+       }
 };
 
 function do_series(series)
@@ -574,11 +758,19 @@ function showcarousel()
        let games_per_group = [];
        let combined_teams = [];
        let combined_games = [];
-       let num_left = 3;
+       let groups_to_get = [
+               'Group A',
+               'Group B',
+               // 'Group C',
+               // 'Playoffs 9th-13th',
+               'Playoffs'
+       ];
+       let num_left = groups_to_get.length;
 
        let cb = function(response, group_name) {
                let teams = parse_teams_from_spreadsheet(response);
                let games = parse_games_from_spreadsheet(response, group_name, true);
+               teams = filter_teams(teams, response);
                teams_per_group[group_name] = teams;
                games_per_group[group_name] = games;
 
@@ -601,9 +793,9 @@ function showcarousel()
                }
        };
 
-       get_group('Group A', cb);
-       get_group('Group B', cb);
-       get_group('Playoffs', cb);
+       for (const group of groups_to_get) {
+               get_group(group, cb);
+       }
 };
 
 function stopcarousel()
@@ -623,5 +815,32 @@ function hidescorebug()
 function showscorebug()
 {
        document.getElementById('entire-bug').style.display = null;
-};
+}
+
+function showmatch2()
+{
+       let css = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-fill-mode: both;";
+       document.getElementById('scorebug2').style = css;
+       document.getElementById('clockbug2').style = css;
+}
 
+function hidematch2()
+{
+       let css = "-webkit-animation: fade-out 1.0s ease; -webkit-animation-fill-mode: both;";
+       document.getElementById('scorebug2').style = css;
+       document.getElementById('clockbug2').style = css;
+}
+
+function showmatch3()
+{
+       let css = "-webkit-animation: fade-in 1.0s ease; -webkit-animation-fill-mode: both;";
+       document.getElementById('scorebug3').style = css;
+       document.getElementById('clockbug3').style = css;
+}
+
+function hidematch3()
+{
+       let css = "-webkit-animation: fade-out 1.0s ease; -webkit-animation-fill-mode: both;";
+       document.getElementById('scorebug3').style = css;
+       document.getElementById('clockbug3').style = css;
+}