X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=www%2Findex.pl;h=697470cdd75a6002c92ed6b2919bef3b15258007;hb=8964d30bbe836e9c0989208be582d3c7213eb574;hp=b754d4cffc98f44c72cbc91e9f1de1a3d5f5bf1a;hpb=aad9399b1ff68ba788c922872288b1e778484af1;p=wloh

diff --git a/www/index.pl b/www/index.pl
index b754d4c..697470c 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -29,8 +29,6 @@ my %players = ();
 my %ratings = ();
 my %ratings_stddev = ();
 my @matches = ();
-my %parms = ();
-my $match_stddev;
 
 sub sanitize {
 	return HTML::Entities::encode_entities(shift);
@@ -121,15 +119,67 @@ EOF
 EOF
 }
 
-sub make_table {
-	my ($lowest_division, $used_ratings, $used_cov) = @_;
+sub get_players_and_ratings {
+	my ($dbh, $season, $division, $subdivision) = @_;
 
-	print <<"EOF";
+	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);
 
-    <table>
-      <tr>
-        <th></th>
-EOF
+	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 ($aux_parms, $match_stddev, $used_ratings, $used_cov) = @_;
+
+	POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+
+	my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
 
 	POSIX::setlocale(&POSIX::LC_ALL, 'C');
 
@@ -140,7 +190,7 @@ EOF
 	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;
 	}
@@ -149,7 +199,7 @@ EOF
 	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->{-3});
 			} else {
 				printf MCCALC "%f ", ($used_cov->{$id1}{$id2} // 0.0);
 			}
@@ -164,6 +214,34 @@ EOF
 
 	POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
 
+	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";
+    <script type="text/javascript">
+    <!--
+function showScenario(element_id, url) {
+    var obj = document.getElementById(element_id);
+    var parent = obj.parentElement;
+    parent.removeChild(obj);
+    obj = obj.cloneNode();
+    obj.data = url;
+    parent.appendChild(obj);
+}
+    //-->
+    </script>
+    <table class="probmatrix">
+      <tr>
+        <th></th>
+EOF
+
+	my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, $used_ratings, $used_cov);
 	my %prob = ();
 
 	open MCCALC, "$config::base_dir/mcwordfeud $trials < $tmpnam |"
@@ -172,7 +250,7 @@ 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->{-3});
 		$prob{$player} = [ @x[1..$#x] ];
 	}
 	close MCCALC;
@@ -185,7 +263,9 @@ EOF
 	print "        <th>NEDRYKK</th>\n" unless ($lowest_division);
 	print "      </tr>\n";
 
+	my $pnum = 0;
 	for my $player (sort { $a cmp $b } keys %prob) {
+		++$pnum;
 		print "      <tr>\n";
 		print "        <th>$player</th>\n";
 
@@ -202,7 +282,12 @@ EOF
 				($r, $b) = ($b, $r);
 			}
 
-			printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\">%.1f%%</td>\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) {
+				printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\">%.1f%%</td>\n", $pn * 100.0;
+			} else {
+				printf "        <td style=\"background-color: rgb($r, $g, $b)\" class=\"num\"><a class=\"unmarkedlink\" href=\"javascript:showScenario('scenario$num_tables', '/?divisjon=$division;avdeling=$subdivision;spiller=$pnum;posisjon=$i');\">%.1f%%</a></td>\n", $pn * 100.0;
+			}
 		}
 
 		unless ($lowest_division) {
@@ -218,49 +303,63 @@ EOF
 
 	print << "EOF";
     </table>
+    
+    <p class="scenario"><object id="scenario$num_tables" data="" type="text/html"></object></p>
 EOF
 }
 
-# Get auxillary parameters
-my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0');
-$q->execute;
+sub find_avg_rating {
+	my ($ratings) = shift;
 
-while (my $ref = $q->fetchrow_hashref) {
-	$parms{$ref->{'id'}} = $ref->{'rating'};
+	my $sum_rating = 0.0;
+	for my $r (values %$ratings) {
+		$sum_rating += $r;
+	}
+	return $sum_rating / scalar keys %ratings;
 }
-$match_stddev = $parms{-2} * sqrt(2.0);
 
-my $season;
-my $division = $cgi->param('divisjon') // -1;
-my $subdivision = $cgi->param('avdeling') // -1;
-my $last_division = 0;
+sub get_auxillary_parameters {
+	my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0');
+	$q->execute;
 
-POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+	my $aux_parms = {};
+	while (my $ref = $q->fetchrow_hashref) {
+		$aux_parms->{$ref->{'id'}} = $ref->{'rating'};
+	}
+	return $aux_parms;
+}
 
-print $cgi->header(-type=>'text/html; charset=utf-8', -expires=>'now');
-printf <<"EOF", $match_stddev;
+sub print_header {
+	my ($cgi, $title) = @_;
+	print $cgi->header(-type=>'text/html; charset=utf-8', -expires=>'now');
+	print <<"EOF";
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE
   html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
   "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="no">
   <head>
-    <title>WLoH-plasseringsannsynlighetsberegning</title>
+    <title>$title</title>
     <link rel="stylesheet" href="/style" type="text/css" />
   </head>
   <body>
-    <h1>WLoH-plasseringsannsynlighetsberegning</h1>
+EOF
+}
 
-    <p><em>Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av
-      <a href="http://wordfeud.aasmul.net/">Wordfeud Leage of Honour</a>.</em></p>
+sub print_footer {
+	print <<"EOF";
+  </body>
+</html>
+EOF
+}
 
-    <p>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.</p>
+my $aux_parms = get_auxillary_parameters($dbh);
+my $match_stddev = $aux_parms->{-2} * sqrt(2.0);
 
-    <p>Spillerne er sortert etter nick.</p>
-EOF
+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 = get_max_season($dbh);
 my @divisions = get_divisions($dbh, $season);
@@ -268,68 +367,78 @@ $division = 1 if (!grep { $_ == $division } @divisions);
 my @subdivisions = get_subdivisions($dbh, $season, $division);
 $subdivision = 1 if (!grep { $_ == $subdivision } @subdivisions);
 
-print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision);
+get_players_and_ratings($dbh, $season, $division, $subdivision);
+@matches = get_matches($dbh, $season, $division, $subdivision);
+my $cov = get_covariance_matrix($dbh, keys %players);
 
-# Get players and ratings
-my $sum_rating = 0.0;
+print_header($cgi, 'WLoH-plasseringsannsynlighetsberegning');
 
-$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);
+if (defined($match_player) && defined($match_position)) {
+	my $tmpnam = write_parms_to_file($aux_parms, $match_stddev, \%ratings, $cov);
 
-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;
+	--$match_player;
+	--$match_position;
+
+	my @scenario = ();
+	open MCCALC, "$config::base_dir/mcwordfeud $trials $match_player $match_position < $tmpnam |"
+		or die "mccalc: $!";
+	while (<MCCALC>) {
+		/(\d+) (\d+) (-?\d+)/ or next;
+		chomp;
+		push @scenario, [ $1, $2, $3 ];
+	}
+	close MCCALC;
+	#unlink $tmpnam;
 
-# 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 @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+	my $player_name = $players{$sorted_players[$match_player]};
+
+	if (scalar @scenario == 0) {
+		printf "    <p>Fant ingen m&aring;te <strong>%s</strong> kan ende p&aring; <strong>%d.</strong> plass p&aring;.</p>\n",
+			$player_name, ($match_position + 1);
+	} else {
+		printf "    <p>Scenario der <strong>%s</strong> ender p&aring; <strong>%d.</strong> plass:</p>\n",
+			$player_name, ($match_position + 1);
+		print "    <ul>\n";
+		for my $m (@scenario) {
+			printf "    <li>%s &ndash; %s: %+d</li>\n", $players{$m->[0]}, $players{$m->[1]}, $m->[2];
+		}
+		print "    </ul>\n";
+	}
+} else {
+	POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
+	printf <<"EOF", $match_stddev;
+    <h1>WLoH-plasseringsannsynlighetsberegning</h1>
 
-my $cov = {};
-while (my $ref = $q->fetchrow_hashref) {
-	$cov->{$ref->{'player1'}}{$ref->{'player2'}} = $ref->{'cov'};
-}
+    <p><em>Dette er et hobbyprosjekt fra tredjepart, og ikke en offisiell del av
+      <a href="http://wordfeud.aasmul.net/">Wordfeud Leage of Honour</a>.</em></p>
 
-my $max_division = $divisions[$#divisions];
-my $lowest_division = ($division == $max_division);
-make_table($lowest_division, {}, {});
+    <p>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.</p>
+
+    <p>Spillerne er sortert etter nick.</p>
+EOF
+
+	print_division_selector($dbh, \@divisions, \@subdivisions, $division, $subdivision);
+
+	my $max_division = $divisions[$#divisions];
+	my $lowest_division = ($division == $max_division);
+	make_table($aux_parms, $match_stddev, $lowest_division, {}, {}, $division, $subdivision);
 
-print <<"EOF";
-    <p>Under er en variant som tar relativ spillestyrke med i beregningen;
+	print <<"EOF";
+    <p style="clear: both; padding-top: 1em;">Under er en variant som tar relativ spillestyrke med i beregningen;
       se <a href="/rating">ratingsiden</a>.</p>
 EOF
 
-make_table($lowest_division, \%ratings, $cov);
+	make_table($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision);
 
-my $avg_rating = $sum_rating / scalar keys %players;
-printf "    <p>Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
+	my $avg_rating = find_avg_rating(\%ratings);
+	printf "    <p style=\"clear: both; padding-top: 1em;\">Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
 
-wloh_common::output_last_sync($dbh);
+	wloh_common::output_last_sync($dbh);
+}
 
-print <<"EOF";
-  </body>
-</html>
-EOF
+print_footer();