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

diff --git a/www/index.pl b/www/index.pl
index 8274574..697470c 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -177,6 +177,10 @@ sub get_covariance_matrix {
 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');
 
 	my $tmpnam = POSIX::tmpnam();
@@ -186,7 +190,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;
 	}
@@ -213,12 +217,26 @@ sub write_parms_to_file {
 	return $tmpnam;
 }
 
+my $num_tables = 0;
+
 sub make_table {
-	my ($aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov) = @_;
+	my ($aux_parms, $match_stddev, $lowest_division, $used_ratings, $used_cov, $division, $subdivision) = @_;
+	++$num_tables;
 
 	print <<"EOF";
-
-    <table>
+    <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
@@ -245,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";
 
@@ -262,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) {
@@ -278,6 +303,8 @@ EOF
 
 	print << "EOF";
     </table>
+    
+    <p class="scenario"><object id="scenario$num_tables" data="" type="text/html"></object></p>
 EOF
 }
 
@@ -363,10 +390,15 @@ if (defined($match_player) && defined($match_position)) {
 	close MCCALC;
 	#unlink $tmpnam;
 
+	my @sorted_players = sort { $players{$a} cmp $players{$b} } keys %players;
+	my $player_name = $players{$sorted_players[$match_player]};
+
 	if (scalar @scenario == 0) {
-		# FIXME: distinguish between "all played" and "none found"
-		print "    <p>Fant ingen m&aring;te dette kunne skje p&aring.</p>\n";
+		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];
@@ -384,7 +416,8 @@ if (defined($match_player) && defined($match_position)) {
     <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>
+      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
@@ -393,17 +426,17 @@ EOF
 
 	my $max_division = $divisions[$#divisions];
 	my $lowest_division = ($division == $max_division);
-	make_table($aux_parms, $match_stddev, $lowest_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;
+    <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($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov);
+	make_table($aux_parms, $match_stddev, $lowest_division, \%ratings, $cov, $division, $subdivision);
 
 	my $avg_rating = find_avg_rating(\%ratings);
-	printf "    <p>Gjennomsnittlig rating i denne avdelingen er <strong>%.1f</strong>.</p>\n", $avg_rating;
+	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);
 }