X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Findex.pl;h=efa55175bd828ef927a485e0d6172004fc138435;hb=ec88f67e841ab19faaac402bf981237b0e101c8e;hp=6a869a934f6d7ee054b51296c7d22e3ac331a5c3;hpb=933440f50f4ac2267adfca3442a4d8e9aebd6d8b;p=wloh diff --git a/www/index.pl b/www/index.pl index 6a869a9..efa5517 100755 --- a/www/index.pl +++ b/www/index.pl @@ -11,8 +11,9 @@ use HTML::Entities; use Encode; use utf8; use locale; -require '../config.pm'; -require '../common.pm'; +use lib qw(../include); +require 'config.pm'; +require 'common.pm'; my $cgi = CGI->new; @@ -30,22 +31,18 @@ my %ratings = (); my %ratings_stddev = (); my @matches = (); -sub sanitize { - return HTML::Entities::encode_entities(shift); -} - sub color { my $x = shift; return int(255.0 * ($x ** (1.80))); } sub get_divisions { - my ($dbh, $season) = @_; + my ($dbh, $locale, $season) = @_; my @divisions = (); - my $q = $dbh->prepare('SELECT DISTINCT(divisjon) FROM fotballserier WHERE sesong=? ORDER BY divisjon'); - $q->execute($season); + my $q = $dbh->prepare('SELECT DISTINCT(divisjon) FROM fotballserier se JOIN fotballspraak sp ON se.spraak=sp.id WHERE kultur=? AND sesong=? ORDER BY divisjon'); + $q->execute($locale, $season); while (my $ref = $q->fetchrow_hashref) { push @divisions, $ref->{'divisjon'}; @@ -55,12 +52,12 @@ sub get_divisions { } sub get_subdivisions { - my ($dbh, $season, $division) = @_; + my ($dbh, $locale, $season, $division) = @_; my @subdivisions = (); - my $q = $dbh->prepare('SELECT DISTINCT(avdeling) FROM fotballserier WHERE sesong=? AND divisjon=? ORDER BY avdeling'); - $q->execute($season, $division); + my $q = $dbh->prepare('SELECT DISTINCT(avdeling) FROM fotballserier se JOIN fotballspraak sp ON se.spraak=sp.id WHERE kultur=? AND sesong=? AND divisjon=? ORDER BY avdeling'); + $q->execute($locale, $season, $division); while (my $ref = $q->fetchrow_hashref) { push @subdivisions, $ref->{'avdeling'}; @@ -69,59 +66,30 @@ sub get_subdivisions { return @subdivisions; } -sub print_division_selector { - my ($dbh, $divisions, $subdivisions, $division, $subdivision) = @_; - - print <<"EOF"; -
-EOF - - my $max_division = $divisions->[(scalar @$divisions) - 1]; - - print <<"EOF"; -

Divisjon: - - Avdeling: - - -

-
-EOF + return \@ret; } sub get_players_and_ratings { - my ($dbh, $season, $division, $subdivision) = @_; + my ($dbh, $locale, $season, $division, $subdivision) = @_; - my $q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating,rating_stddev FROM fotballdeltagere JOIN fotballserier ON fotballdeltagere.serie=fotballserier.nr LEFT JOIN ratings ON fotballdeltagere.id=ratings.id WHERE sesong=? AND divisjon=? AND avdeling=?'); - $q->execute($season, $division, $subdivision); + my $q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating,rating_stddev FROM fotballdeltagere JOIN fotballserier ON fotballdeltagere.serie=fotballserier.nr NATURAL JOIN spiller_kultur LEFT JOIN ratings ON fotballdeltagere.id=ratings.id WHERE kultur=? AND sesong=? AND divisjon=? AND avdeling=?'); + $q->execute($locale, $season, $division, $subdivision); while (my $ref = $q->fetchrow_hashref) { my $id = $ref->{'id'}; - $players{$id} = sanitize(Encode::decode_utf8($ref->{'navn'})); + $players{$id} = Encode::decode_utf8($ref->{'navn'}); $ratings{$id} = $ref->{'rating'}; $ratings_stddev{$id} = $ref->{'rating_stddev'}; } @@ -129,21 +97,22 @@ sub get_players_and_ratings { } sub get_matches { - my ($dbh, $season, $division, $subdivision) = @_; + my ($dbh, $locale, $season, $division, $subdivision) = @_; my @matches = (); my $q = $dbh->prepare(' SELECT d1.id AS p1, d2.id AS p2, maalfor AS score1, maalmot AS score2 - FROM fotballresultater r + FROM ( SELECT * FROM fotballresultater UNION ALL SELECT * FROM fotballresultater_2123 ) r JOIN fotballserier s ON r.serie=s.nr + JOIN fotballspraak sp ON s.spraak=sp.id JOIN fotballdeltagere d1 ON r.lagrecno=d1.nr AND r.serie=d1.serie JOIN fotballdeltagere d2 ON r.motstander=d2.nr AND r.serie=d2.serie WHERE - sesong=? AND divisjon=? AND avdeling=? + kultur=? AND sesong=? AND divisjon=? AND avdeling=? AND lagrecno > motstander '); - $q->execute($season, $division, $subdivision); + $q->execute($locale, $season, $division, $subdivision); while (my $ref = $q->fetchrow_hashref) { push @matches, [ $ref->{'p1'}, $ref->{'p2'}, $ref->{'score1'}, $ref->{'score2'} ]; @@ -169,9 +138,9 @@ sub get_covariance_matrix { } sub write_parms_to_file { - my ($aux_parms, $match_stddev, $used_ratings, $used_cov) = @_; + my ($locale, $aux_parms, $match_stddev, $used_ratings, $used_cov) = @_; - POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8'); + wloh_common::set_locale($locale); my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players; @@ -193,7 +162,7 @@ sub write_parms_to_file { for my $id1 (keys %players) { for my $id2 (keys %players) { if ($id1 == $id2) { - printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // $aux_parms->{-3}); + printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // $aux_parms->{'rating_prior_stddev'}); } else { printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // 0.0); } @@ -206,36 +175,15 @@ sub write_parms_to_file { } close MCCALC; - POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8'); + wloh_common::set_locale($locale); return $tmpnam; } -my $num_tables = 0; - sub make_table { - my ($aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov, $division, $subdivision) = @_; - ++$num_tables; - - print <<"EOF"; - - - - -EOF + my ($locale, $aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov, $division, $subdivision, $table_id) = @_; - my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, $used_ratings, $used_cov); + my $tmpnam = write_parms_to_file($locale, $aux_parms, $match_stddev, $used_ratings, $used_cov); my %prob = (); open MCCALC, "$config::base_dir/mcwordfeud $trials < $tmpnam |" @@ -244,24 +192,27 @@ EOF chomp; my @x = split /\s+/; my $id = $x[0]; - my $player = sprintf "%s (%.0f ± %.0f)", $players{$id}, ($ratings{$id} // 500.0), ($ratings_stddev{$id} // $aux_parms->{-3}); + my $player = sprintf "%s (%.0f ± %.0f)", $players{$id}, ($ratings{$id} // 500.0), ($ratings_stddev{$id} // $aux_parms->{'rating_prior_stddev'}); $prob{$player} = [ @x[1..$#x] ]; } close MCCALC; unlink $tmpnam; my $num_games = scalar keys %prob; + + # Make list of ranks. (Relegation is handled specially.) + my @ranks = (); for my $i (1..$num_games) { - print " \n"; + push @ranks, { 'th' => "$i." }; } - print " \n" unless ($lowest_division); - print " \n"; + + my @players = (); my $pnum = 0; for my $player (sort { $a cmp $b } keys %prob) { ++$pnum; - print " \n"; - print " \n"; + + my @player_ranks = (); for my $i (1..$num_games) { my $pn = $prob{$player}->[$i - 1] / $trials; @@ -278,9 +229,17 @@ EOF my $num_total_games = ($num_games * ($num_games - 1)) / 2; if (scalar @matches == $num_total_games || $prob{$player}->[$i - 1] == $trials) { - printf " \n", $pn * 100.0; + push @player_ranks, { + 'td/style' => "background-color: rgb($r, $g, $b)", + 'td' => sprintf("%.1f%%", $pn * 100.0), + 'link' => '' + }; } else { - printf " \n", $pn * 100.0; + push @player_ranks, { + 'td/style' => "background-color: rgb($r, $g, $b)", + 'a' => sprintf("%.1f%%", $pn * 100.0), + 'a/href' => "javascript:showScenario('$table_id', '/$locale/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i')" + }; } } @@ -290,37 +249,62 @@ EOF my $r = color(1.0); my $g = color(1.0 - $pn / 3); my $b = color(1.0 - $pn / 3); - printf " \n", $pn * 100.0; + push @player_ranks, { + 'td/style' => "background-color: rgb($r, $g, $b)", + 'td' => sprintf("%.1f%%", $pn * 100.0), + 'link' => '' + }; } - print " \n"; + push @players, { + 'player' => $player, + 'player-ranks' => \@player_ranks + }; } - print << "EOF"; -
$i.NEDRYKK
$player%.1f%%%.1f%%%.1f%%
- -

-EOF + my $parms = { + 'ranks' => \@ranks, + 'tbody' => \@players, + }; + $parms->{'relegation'} = '' if ($lowest_division); + return $parms; } -sub find_avg_rating { - my ($ratings) = shift; +sub make_cov_table { + my ($cov) = @_; + my @players = (sort { $players{$a} cmp $players{$b} } keys %players); - my $sum_rating = 0.0; - for my $r (values %$ratings) { - $sum_rating += $r; + my @player_list = (); + for my $player (@players) { + push @player_list, { 'th' => $players{$player} }; + } + + my @player_rows = (); + for my $player (@players) { + my @elements = (); + for my $player2 (@players) { + my $c = sprintf("%.2f", $cov->{$player}{$player2}); + push @elements, { 'td' => $c }; + } + push @player_rows, { + '#player' => $players{$player}, + 'elements' => \@elements + }; } - return $sum_rating / scalar keys %ratings; + + return { + 'player-list' => \@player_list, + 'tbody' => \@player_rows + }; } -sub get_auxillary_parameters { - my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0'); - $q->execute; +sub find_avg_rating { + my ($ratings) = shift; - my $aux_parms = {}; - while (my $ref = $q->fetchrow_hashref) { - $aux_parms->{$ref->{'id'}} = $ref->{'rating'}; + my $sum_rating = 0.0; + for my $r (values %$ratings) { + $sum_rating += ($r // 500.0); } - return $aux_parms; + return $sum_rating / scalar keys %$ratings; } sub print_header { @@ -340,13 +324,6 @@ sub print_header { EOF } -sub get_locale { - my $cgi = shift; - my $url = $cgi->url(-absolute => 1); - $url =~ m#^/([a-z][a-z]-[A-Z][A-Z])/# or die "Invalid locale!"; - return $1; -} - sub print_footer { print <<"EOF"; @@ -354,28 +331,29 @@ sub print_footer { EOF } -my $aux_parms = get_auxillary_parameters($dbh); -my $match_stddev = $aux_parms->{-2} * sqrt(2.0); +my $locale = wloh_common::get_locale($cgi); +my $aux_parms = wloh_common::get_auxillary_parameters($dbh, $locale); +my $match_stddev = $aux_parms->{'score_stddev'} * sqrt(2.0); my $division = $cgi->param('divisjon') // -1; my $subdivision = $cgi->param('avdeling') // -1; my $match_player = $cgi->param('spiller'); my $match_position = $cgi->param('posisjon'); -my $season = wloh_common::get_max_season($dbh); -my @divisions = get_divisions($dbh, $season); -$division = 1 if (!grep { $_ == $division } @divisions); -my @subdivisions = get_subdivisions($dbh, $season, $division); -$subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions); +my $season = wloh_common::get_max_season($dbh, $locale); +die "Nonexistent locale!" if (!defined($season)); -get_players_and_ratings($dbh, $season, $division, $subdivision); -@matches = get_matches($dbh, $season, $division, $subdivision); -my $cov = get_covariance_matrix($dbh, keys %players); +my @divisions = get_divisions($dbh, $locale, $season); +$division = $divisions[0] if (!grep { $_ == $division } @divisions); +my @subdivisions = get_subdivisions($dbh, $locale, $season, $division); +$subdivision = $subdivisions[0] if (!grep { $_ == $subdivision } @subdivisions); -print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning'); +get_players_and_ratings($dbh, $locale, $season, $division, $subdivision); +@matches = get_matches($dbh, $locale, $season, $division, $subdivision); +my $cov = get_covariance_matrix($dbh, keys %players); if (defined($match_player) && defined($match_position)) { - my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, \%ratings, $cov); + my $tmpnam = write_parms_to_file($locale, $aux_parms, $match_stddev, \%ratings, $cov); --$match_player; --$match_position; @@ -386,7 +364,11 @@ if (defined($match_player) && defined($match_position)) { while () { /(\d+) (\d+) (-?\d+)/ or next; chomp; - push @scenario, [ $1, $2, $3 ]; + push @scenario, { + 'player-1' => $players{$1}, + 'player-2' => $players{$2}, + 'result' => sprintf("%+d", $3), + }; } close MCCALC; unlink $tmpnam; @@ -395,51 +377,42 @@ if (defined($match_player) && defined($match_position)) { my $player_name = $players{$sorted_players[$match_player]}; if (scalar @scenario == 0) { - printf "

Fant ingen måte %s kan ende på %d. plass på.

\n", - $player_name, ($match_position + 1); + print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m'); + wloh_common::process_template('scenario-not-found', $locale, { + '#nick' => $player_name, + '#rank' => sprintf("%d.", $match_position + 1) + }); } else { - printf "

Scenario der %s ender på %d. plass:

\n", - $player_name, ($match_position + 1); - print " \n"; + print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m'); + wloh_common::process_template('scenario', $locale, { + '#nick' => $player_name, + '#rank' => sprintf("%d.", $match_position + 1), + '#results' => \@scenario + }); } } else { - POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8'); - printf <<"EOF", $match_stddev; -

WLoH-plasseringsannsynlighetsberegning

- -

Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av - Wordfeud Leage of Honour.

- -

Beregningen tar ikke hensyn til ujevn spillestyrke, ting som er sagt i forumet e.l.; - den antar at samtlige uspilte kamper trekkes fra en normalfordeling med standardavvik - %.1f poeng. Sannsynlighetene kan summere til andre tall enn 100%% pga. avrunding. - Tallene vil variere litt fra gang til gang fordi utregningen skjer ved randomisering. - For scenarioeksempel, klikk i en rute.

- -

Spillerne er sortert etter nick.

-EOF - - print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision); + wloh_common::set_locale($locale); my $max_division = $divisions[$#divisions]; my $lowest_division = ($division == $max_division); - make_table($aux_parms, $match_stddev, $lowest_division, {}, {}, $division, $subdivision); - - print <<"EOF"; -

Under er en variant som tar relativ spillestyrke med i beregningen; - se ratingsiden.

-EOF - - make_table($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision); + my $basic_table = make_table($locale, $aux_parms, $match_stddev, $lowest_division, {}, {}, $division, $subdivision, 'scenario1'); + my $adjusted_table = make_table($locale, $aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision, 'scenario2'); + my $cov_table = (defined($cgi->param('showcov'))) ? make_cov_table($cov) : ''; my $avg_rating = find_avg_rating(\%ratings); - printf "

Gjennomsnittlig rating i denne avdelingen er %.1f.

\n", $avg_rating; - wloh_common::output_last_sync($dbh); + print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m'); + wloh_common::process_template('index', $locale, { + '#navbar' => wloh_common::get_navbar($cgi, $dbh, $locale), + '#division-selector/action' => "/$locale/", + '#division' => get_division_selector(\@divisions, $division), + '#subdivision' => get_division_selector(\@subdivisions, $subdivision), + '#basic-probabilities' => $basic_table, + '#adjusted-probabilities' => $adjusted_table, + 'cov-table' => $cov_table, + 'match-stddev' => sprintf("%.1f", $match_stddev), + '#average-rating' => sprintf("%.1f", $avg_rating), + 'last-sync' => wloh_common::get_last_sync($dbh), + }); } -print_footer();