From d9a172a3b90abf4bbb174a432b6e63447942b14a Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Mon, 19 Mar 2012 01:02:02 +0100
Subject: [PATCH] Fix rating display after the stddev changes.

---
 bayeswf.cpp  | 8 ++++----
 www/index.pl | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/bayeswf.cpp b/bayeswf.cpp
index 6441801..7ee0120 100644
--- a/bayeswf.cpp
+++ b/bayeswf.cpp
@@ -337,7 +337,7 @@ int main(int argc, char **argv)
 		sumdiff += (global_sigma - old_global_sigma) * (global_sigma - old_global_sigma);
 		if (sumdiff < EPSILON) {
 			//fprintf(stderr, "Converged after %d iterations. Stopping.\n", j);
-			printf("%d -1\n", j + 1);
+			printf("%d 0 -1\n", j + 1);
 			break;
 		}
 	}
@@ -348,11 +348,11 @@ int main(int argc, char **argv)
 	compute_mu_uncertainty(mu, num_players);
 	dump_scores(players, mu, mu_stddev, num_players);
 	//fprintf(stderr, "Optimal sigma: %f (two-player: %f)\n", sigma[0], sigma[0] * sqrt(2.0f));
-	printf("%f -2\n", global_sigma / sqrt(2.0f));
-	printf("%f -3\n", prior_sigma);
+	printf("%f 0 -2\n", global_sigma / sqrt(2.0f));
+	printf("%f 0 -3\n", prior_sigma);
 
 	float total_logl = compute_total_logl(mu, num_players);
-	printf("%f -4\n", total_logl);
+	printf("%f 0 -4\n", total_logl);
 
 //	construct_hessian(mu, sigma, num_players);
 #endif
diff --git a/www/index.pl b/www/index.pl
index 4c82608..604edc2 100755
--- a/www/index.pl
+++ b/www/index.pl
@@ -58,7 +58,7 @@ EOF
 	printf MCCALC "%d\n", scalar keys %players;
 
 	for my $id (keys %players) {
-		if (exists($used_ratings->{$id})) {
+		if (exists($used_ratings->{$id}) && defined($used_ratings->{$id})) {
 			printf MCCALC "%s %f\n", $id, $used_ratings->{$id};
 		} else {
 			printf MCCALC "%s %f\n", $id, 1500.0;
@@ -230,7 +230,7 @@ print <<"EOF";
 EOF
 
 # Get players and ratings
-$q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating FROM fotballdeltagere JOIN fotballserier ON fotballdeltagere.serie=fotballserier.nr JOIN ratings ON fotballdeltagere.id=ratings.id AND sesong=? AND divisjon=? AND avdeling=?');
+$q = $dbh->prepare('SELECT fotballdeltagere.id,fotballdeltagere.navn,rating 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) {
-- 
2.39.2