return @subdivisions;
}
-sub make_table {
- my ($lowest_division, $used_ratings, $used_cov) = @_;
+sub print_division_selector {
+ my ($dbh, $divisions, $subdivisions, $division, $subdivision) = @_;
print <<"EOF";
+ <form method="get" action="/">
+EOF
- <table>
- <tr>
- <th></th>
+ my $max_division = $divisions->[(scalar @$divisions) - 1];
+
+ print <<"EOF";
+ <p>Divisjon:
+ <select name="divisjon" onchange="form.submit();">
+EOF
+
+ for my $d (@$divisions) {
+ if ($d == $division) {
+ print " <option value=\"$d\" selected=\"selected\">$d</option>\n";
+ } else {
+ print " <option value=\"$d\">$d</option>\n";
+ }
+ }
+
+ print <<"EOF";
+ </select>
+ Avdeling:
+ <select name="avdeling" onchange="form.submit();">
+EOF
+
+ for my $sd (@$subdivisions) {
+ if ($sd == $subdivision) {
+ print " <option value=\"$sd\" selected=\"selected\">$sd</option>\n";
+ } else {
+ print " <option value=\"$sd\">$sd</option>\n";
+ }
+ }
+
+ print <<"EOF";
+ </select>
+ <input type="submit" value="Vis" />
+ </p>
+ </form>
EOF
+}
+
+sub get_players_and_ratings {
+ my ($dbh, $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);
+
+ 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'};
+ }
+ $q->finish;
+}
+
+sub get_matches {
+ my ($dbh, $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
+ 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;
+
+ return @matches;
+}
+
+sub get_covariance_matrix {
+ my ($dbh, @players) = @_;
+
+ my $player_sql = '{' . join(',', @players ) . '}';
+ my $q = $dbh->prepare('SELECT * FROM covariance WHERE player1=ANY(?::smallint[]) AND player2=ANY(?::smallint[])', { pg_prepare_now => 0 });
+ $q->execute($player_sql, $player_sql);
+
+ my $cov = {};
+ while (my $ref = $q->fetchrow_hashref) {
+ $cov->{$ref->{'player1'}}{$ref->{'player2'}} = $ref->{'cov'};
+ }
+
+ return $cov;
+}
+
+sub write_parms_to_file {
+ my ($used_ratings, $used_cov) = @_;
POSIX::setlocale(&POSIX::LC_ALL, 'C');
POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+ return $tmpnam;
+}
+
+sub make_table {
+ my ($lowest_division, $used_ratings, $used_cov) = @_;
+
+ print <<"EOF";
+
+ <table>
+ <tr>
+ <th></th>
+EOF
+
+ my $tmpnam = write_parms_to_file($used_ratings, $used_cov);
my %prob = ();
open MCCALC, "$config::base_dir/mcwordfeud $trials < $tmpnam |"
EOF
}
+sub find_avg_rating {
+ my ($ratings) = shift;
+
+ my $sum_rating = 0.0;
+ for my $r (values %$ratings) {
+ $sum_rating += $r;
+ }
+ return $sum_rating / scalar keys %ratings;
+}
+
# Get auxillary parameters
my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0');
$q->execute;
Tallene vil variere litt fra gang til gang fordi utregningen skjer ved randomisering.</p>
<p>Spillerne er sortert etter nick.</p>
-
- <form method="get" action="/">
EOF
my $season = get_max_season($dbh);
my @divisions = get_divisions($dbh, $season);
$division = 1 if (!grep { $_ == $division } @divisions);
-my $max_division = $divisions[$#divisions];
-
-print <<"EOF";
- <p>Divisjon:
- <select name="divisjon" onchange="form.submit();">
-EOF
-
-for my $d (@divisions) {
- if ($d == $division) {
- print " <option value=\"$d\" selected=\"selected\">$d</option>\n";
- } else {
- print " <option value=\"$d\">$d</option>\n";
- }
-}
-
-print <<"EOF";
- </select>
- Avdeling:
- <select name="avdeling" onchange="form.submit();">
-EOF
-
my @subdivisions = get_subdivisions($dbh, $season, $division);
$subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions);
-for my $sd (@subdivisions) {
- if ($sd == $subdivision) {
- print " <option value=\"$sd\" selected=\"selected\">$sd</option>\n";
- } else {
- print " <option value=\"$sd\">$sd</option>\n";
- }
-}
-
-print <<"EOF";
- </select>
- <input type="submit" value="Vis" />
- </p>
- </form>
-EOF
-
-# Get players and ratings
-my $sum_rating = 0.0;
+print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision);
-$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);
+get_players_and_ratings($dbh, $season, $division, $subdivision);
-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);
+my @matches = get_matches($dbh, $season, $division, $subdivision);
-while (my $ref = $q->fetchrow_hashref) {
- push @matches, [ $ref->{'p1'}, $ref->{'p2'}, $ref->{'score1'}, $ref->{'score2'} ];
-}
-$q->finish;
-
-# Pick up covariance matrix
-my $player_sql = '{' . join(',', keys %players ) . '}';
-my $q = $dbh->prepare('SELECT * FROM covariance WHERE player1=ANY(?::smallint[]) AND player2=ANY(?::smallint[])', { pg_prepare_now => 0 });
-$q->execute($player_sql, $player_sql);
-
-my $cov = {};
-while (my $ref = $q->fetchrow_hashref) {
- $cov->{$ref->{'player1'}}{$ref->{'player2'}} = $ref->{'cov'};
-}
+my $cov = get_covariance_matrix($dbh, keys %players);
+my $max_division = $divisions[$#divisions];
my $lowest_division = ($division == $max_division);
make_table($lowest_division, {}, {});
make_table($lowest_division, \%ratings, $cov);
-my $avg_rating = $sum_rating / scalar keys %players;
+my $avg_rating = find_avg_rating(\%ratings);
printf " <p>Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
wloh_common::output_last_sync($dbh);
projects / wloh / blobdiff