X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Findex.pl;h=efa55175bd828ef927a485e0d6172004fc138435;hb=ec88f67e841ab19faaac402bf981237b0e101c8e;hp=9bf692ce288ef7f0461f82d4d5e69edfe3d9f7d4;hpb=11849d4e65deae4c901913281176130508c8cbfe;p=wloh diff --git a/www/index.pl b/www/index.pl index 9bf692c..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,10 +31,6 @@ 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))); @@ -69,48 +66,19 @@ sub get_subdivisions { return @subdivisions; } -sub print_division_selector { - my ($dbh, $locale, $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 { @@ -121,7 +89,7 @@ sub get_players_and_ratings { 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'}; } @@ -135,7 +103,7 @@ sub get_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 @@ -170,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; @@ -207,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 ($locale, $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 |" @@ -252,17 +199,20 @@ EOF 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; @@ -279,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')" + }; } } @@ -291,46 +249,52 @@ 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 make_cov_table { my ($cov) = @_; my @players = (sort { $players{$a} cmp $players{$b} } keys %players); - print <<"EOF"; - - - -EOF - + my @player_list = (); for my $player (@players) { - printf " \n", $players{$player}; + push @player_list, { 'th' => $players{$player} }; } - print " \n"; - my $pnum = 0; + my @player_rows = (); for my $player (@players) { - ++$pnum; - print " \n"; - printf " \n", $players{$player}; - + my @elements = (); for my $player2 (@players) { - printf " \n", $cov->{$player}{$player2}; + my $c = sprintf("%.2f", $cov->{$player}{$player2}); + push @elements, { 'td' => $c }; } - print " \n"; + push @player_rows, { + '#player' => $players{$player}, + 'elements' => \@elements + }; } - print "
%s
%s%.3f
\n"; + return { + 'player-list' => \@player_list, + 'tbody' => \@player_rows + }; } sub find_avg_rating { @@ -388,10 +352,8 @@ 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); -print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning'); - 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; @@ -402,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; @@ -411,56 +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'); - wloh_common::print_navbar($cgi, $dbh, $locale); - 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, $locale, \@divisions, \@subdivisions, $division, $subdivision); + wloh_common::set_locale($locale); my $max_division = $divisions[$#divisions]; my $lowest_division = ($division == $max_division); - make_table($locale, $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($locale, $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; - - if (defined($cgi->param('showcov'))) { - make_cov_table($cov); - } - 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();