X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Findex.pl;h=efa55175bd828ef927a485e0d6172004fc138435;hb=ec88f67e841ab19faaac402bf981237b0e101c8e;hp=0ce8cc6d444d844338f03d51b0304e21b3545b4f;hpb=9ac6ff06f2fc46865b190a0ff6c14ac68516c4da;p=wloh diff --git a/www/index.pl b/www/index.pl index 0ce8cc6..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; @@ -29,31 +30,19 @@ my %players = (); my %ratings = (); my %ratings_stddev = (); my @matches = (); -my %parms = (); -my $match_stddev; - -sub sanitize { - return HTML::Entities::encode_entities(shift); -} sub color { my $x = shift; return int(255.0 * ($x ** (1.80))); } -sub get_max_season { - my $dbh = shift; - my $ref = $dbh->selectrow_hashref('SELECT MAX(sesong) AS max_sesong FROM fotballserier'); - return $ref->{'max_sesong'}; -} - 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'}; @@ -63,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'}; @@ -77,48 +66,60 @@ sub get_subdivisions { return @subdivisions; } -sub print_division_selector { - my ($dbh, $divisions, $subdivisions, $division, $subdivision) = @_; +sub get_division_selector { + my ($divisions, $division) = @_; - print <<"EOF"; -
-EOF + return @matches; } sub get_covariance_matrix { @@ -137,7 +138,11 @@ sub get_covariance_matrix { } sub write_parms_to_file { - my ($used_ratings, $used_cov) = @_; + my ($locale, $aux_parms, $match_stddev, $used_ratings, $used_cov) = @_; + + wloh_common::set_locale($locale); + + my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players; POSIX::setlocale(&POSIX::LC_ALL, 'C'); @@ -148,7 +153,7 @@ sub write_parms_to_file { printf MCCALC "%f\n", $match_stddev; printf MCCALC "%d\n", scalar keys %players; - for my $id (keys %players) { + for my $id (@sorted_players) { my $rating = $used_ratings->{$id} // 500.0; printf MCCALC "%s %f\n", $id, $rating; } @@ -157,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} // $parms{-3}); + printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // $aux_parms->{'rating_prior_stddev'}); } else { printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // 0.0); } @@ -170,22 +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; } sub make_table { - my ($lowest_division, $used_ratings, $used_cov) = @_; - - 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($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 |" @@ -194,22 +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} // $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; + 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 " | $i. | \n"; + push @ranks, { 'th' => "$i." }; } - print "NEDRYKK | \n" unless ($lowest_division); - print "
---|---|---|
$player | \n"; + ++$pnum; + + my @player_ranks = (); for my $i (1..$num_games) { my $pn = $prob{$player}->[$i - 1] / $trials; @@ -224,7 +227,20 @@ EOF ($r, $b) = ($b, $r); } - printf "%.1f%% | \n", $pn * 100.0; + my $num_total_games = ($num_games * ($num_games - 1)) / 2; + if (scalar @matches == $num_total_games || $prob{$player}->[$i - 1] == $trials) { + push @player_ranks, { + 'td/style' => "background-color: rgb($r, $g, $b)", + 'td' => sprintf("%.1f%%", $pn * 100.0), + 'link' => '' + }; + } else { + 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')" + }; + } } unless ($lowest_division) { @@ -233,117 +249,170 @@ EOF my $r = color(1.0); my $g = color(1.0 - $pn / 3); my $b = color(1.0 - $pn / 3); - printf "%.1f%% | \n", $pn * 100.0; + push @player_ranks, { + 'td/style' => "background-color: rgb($r, $g, $b)", + 'td' => sprintf("%.1f%%", $pn * 100.0), + 'link' => '' + }; } - print "
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.
- -Spillerne er sortert etter nick.
EOF +} -my $season = 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); +sub print_footer { + print <<"EOF"; + + +EOF +} -print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision); +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); -# Get players and ratings -my $sum_rating = 0.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'); -$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 $season = wloh_common::get_max_season($dbh, $locale); +die "Nonexistent locale!" if (!defined($season)); -while (my $ref = $q->fetchrow_hashref) { - my $id = $ref->{'id'}; - $players{$id} = sanitize(Encode::decode_utf8($ref->{'navn'})); - $ratings{$id} = $ref->{'rating'}; - $ratings_stddev{$id} = $ref->{'rating_stddev'}; - $sum_rating += $ref->{'rating'}; -} -$q->finish; - -$q = $dbh->prepare(' -SELECT - d1.id AS p1, d2.id AS p2, maalfor AS score1, maalmot AS score2 -FROM fotballresultater r - JOIN fotballserier s ON r.serie=s.nr - 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=? - AND lagrecno > motstander -'); -$q->execute($season, $division, $subdivision); - -while (my $ref = $q->fetchrow_hashref) { - push @matches, [ $ref->{'p1'}, $ref->{'p2'}, $ref->{'score1'}, $ref->{'score2'} ]; -} -$q->finish; +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); +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); -my $max_division = $divisions[$#divisions]; -my $lowest_division = ($division == $max_division); -make_table($lowest_division, {}, {}); +if (defined($match_player) && defined($match_position)) { + my $tmpnam = write_parms_to_file($locale, $aux_parms, $match_stddev, \%ratings, $cov); -print <<"EOF"; -Under er en variant som tar relativ spillestyrke med i beregningen; - se ratingsiden.
-EOF + --$match_player; + --$match_position; -make_table($lowest_division, \%ratings, $cov); - -my $avg_rating = $sum_rating / scalar keys %players; -printf "Gjennomsnittlig rating i denne avdelingen er %.1f.
\n", $avg_rating; - -wloh_common::output_last_sync($dbh); + my @scenario = (); + open MCCALC, "$config::base_dir/mcwordfeud $trials $match_player $match_position < $tmpnam |" + or die "mccalc: $!"; + while (