From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 30 May 2012 19:32:34 +0000 (+0200)
Subject: Make rating.pl use the common function for fetching aux parms.
X-Git-Url: https://git.sesse.net/?p=wloh;a=commitdiff_plain;h=44b0ccfdd1c79b013c72d1a6f71e3bc421f14186

Make rating.pl use the common function for fetching aux parms.
---

diff --git a/www/rating.pl b/www/rating.pl
index 40e9165..f69b19a 100755
--- a/www/rating.pl
+++ b/www/rating.pl
@@ -20,19 +20,13 @@ $dbh->{RaiseError} = 1;
 
 binmode STDOUT, ':utf8';
 
-# Find auxillary parameters.
-my %params = ();
-my $q = $dbh->prepare('SELECT * FROM ratings WHERE id < 0');
-$q->execute;
-while (my $ref = $q->fetchrow_hashref) {
-	$params{$ref->{'id'}} = $ref->{'rating'};
-}
-my $match_stddev = $params{-2} * sqrt(2.0);
+my $aux_parms = wloh_common::get_auxillary_parameters($dbh);
+my $match_stddev = $aux_parms->{'score_stddev'} * sqrt(2.0);
 
 print CGI->header(-type=>'text/html; charset=utf-8', -expires=>'+5m');
 POSIX::setlocale(&POSIX::LC_ALL, 'nb_NO.UTF-8');
 
-printf <<"EOF", $params{-3}, $match_stddev;
+printf <<"EOF", $aux_parms->{'rating_prior_stddev'}, $match_stddev;
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE
   html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
@@ -65,7 +59,7 @@ printf <<"EOF", $params{-3}, $match_stddev;
       <a href="ratings-explained">forklaring</a> beregnet pÃ¥ ikke-matematikere.</p>
 
     <ul>
-      <li>MLE-basert modell med Ã©n skalar (styrke) per spiller og to globale skalarer (begge standardavvik, se under), lÃ¸st med syklisk MM (minorization-maximization). Antall iterasjoner fÃ¸r konvergens: $params{-1}.</li>
+      <li>MLE-basert modell med Ã©n skalar (styrke) per spiller og to globale skalarer (begge standardavvik, se under), lÃ¸st med syklisk MM (minorization-maximization). Antall iterasjoner fÃ¸r konvergens: $aux_parms->{num_iterations}.</li>
       <li>Rimelighetfunksjon, prior: Normalfordeling med Âµ=500, &sigma;=%.1f (est.)</li>
       <li>Rimelighetfunksjon, per kamp: Normalfordeling med Âµ=(score1 - score2), &sigma;=%.1f (est.)</li>
       <li>Vekting: InnevÃ¦rende sesong samt de tre siste vektes fullt ut
@@ -90,7 +84,7 @@ my $season = wloh_common::get_max_season($dbh, $locale);
 
 # Pick up all the subdivisions' ratings.
 my %subdivision_ratings = ();
-$q = $dbh->prepare('SELECT divisjon, avdeling, serie_id, AVG(rating) AS avg_rating FROM ratings NATURAL JOIN siste_divisjon WHERE sesong=? GROUP BY divisjon, avdeling, serie_id ORDER BY divisjon, avdeling');
+my $q = $dbh->prepare('SELECT divisjon, avdeling, serie_id, AVG(rating) AS avg_rating FROM ratings NATURAL JOIN siste_divisjon WHERE sesong=? GROUP BY divisjon, avdeling, serie_id ORDER BY divisjon, avdeling');
 $q->execute($season);
 
 while (my $ref = $q->fetchrow_hashref) {
@@ -170,6 +164,4 @@ print <<"EOF";
 </html>
 EOF
 
-$match_stddev = $params{-2} * sqrt(2.0);
-
 $dbh->rollback;
