From 79ca58ab629b09e8fe59415578d2ee1ea5cb2079 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sun, 10 Jun 2012 02:00:02 +0200 Subject: [PATCH] Convert index.pl to templates. --- templates/index.xml | 124 +++++++++++++++++++++++++++ www/index.pl | 200 +++++++++++++++++--------------------------- 2 files changed, 199 insertions(+), 125 deletions(-) create mode 100644 templates/index.xml diff --git a/templates/index.xml b/templates/index.xml new file mode 100644 index 0000000..c3c00cb --- /dev/null +++ b/templates/index.xml @@ -0,0 +1,124 @@ + + + + + WLoH-plasseringsannsynlighetsberegning + + + + +

+ + :: + + + +

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 + 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.

+ + + + + + + + + + + + + + + + + + +

	+ +

+ +

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

+ + + + + + + + + + + + + + + + +

	+ +

+ +

+ + +

Kovarianstabell:

+ + + + + + + + + + +

+	+
+	+

+ + +

Gjennomsnittlig rating i denne avdelingen er .

+
Databasen ble sist synkronisert .
+ + diff --git a/www/index.pl b/www/index.pl index 966f5c7..0bf3559 100755 --- a/www/index.pl +++ b/www/index.pl @@ -70,48 +70,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 { @@ -213,29 +184,8 @@ sub write_parms_to_file { 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 %prob = (); @@ -253,17 +203,21 @@ EOF unlink $tmpnam; my $num_games = scalar keys %prob; + + # Make list of ranks. + my @ranks = (); for my $i (1..$num_games) { - print " \n"; + push @ranks, { 'th' => "$i." }; } - print " \n" unless ($lowest_division); - print " \n"; + push @ranks, { 'th' => 'NEDRYKK' } unless ($lowest_division); + + 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; @@ -280,9 +234,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" + }; } } @@ -292,46 +254,50 @@ 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 + return { + 'ranks' => \@ranks, + 'tbody' => \@players, + }; } 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 { @@ -389,9 +355,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)) { + print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning'); my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, \%ratings, $cov); --$match_player; @@ -423,45 +388,30 @@ if (defined($match_player) && defined($match_position)) { } print " \n"; } + print_footer(); } 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); 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.xml', { + '#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(); -- 2.39.2