X-Git-Url: https://git.sesse.net/?p=wloh;a=blobdiff_plain;f=train.pl;h=9b1e0dcb923ef580014df114878e4a666a7c8199;hp=daa4d7805055da03d5a83e98a8b1b58f83daea9d;hb=854c8eb6e0a3f9836043faaf2f43c05c190619fb;hpb=df74bf90cbb758f689a4e0d5f19f77d74beabd8b

diff --git a/train.pl b/train.pl
index daa4d78..9b1e0dc 100755
--- a/train.pl
+++ b/train.pl
@@ -8,13 +8,13 @@ require './config.pm';
 
 # Find last completely done season 
 sub find_last_season {
-	my $dbh = shift;
-	my $ref = $dbh->selectrow_hashref('SELECT sesong FROM fotballserier GROUP BY sesong HAVING COUNT(*)=COUNT(avgjort=1 OR NULL) ORDER BY sesong DESC LIMIT 1');
+	my ($dbh, $locale) = @_;
+	my $ref = $dbh->selectrow_hashref('SELECT sesong FROM fotballserier se JOIN fotballspraak sp ON se.spraak=sp.id GROUP BY kultur,sesong HAVING COUNT(*)=COUNT(avgjort=1 OR NULL) AND kultur=? ORDER BY kultur,sesong DESC LIMIT 1', undef, $locale);
 	return $ref->{'sesong'};
 }
 
 sub fetch_games {
-	my ($dbh, $last_season, $games, $ids) = @_;
+	my ($dbh, $locale, $last_season, $games, $ids) = @_;
 	my $q = $dbh->prepare('
 SELECT
   deltager1.id as p1, deltager2.id as p2, maalfor, maalmot, least(pow(2.0, (sesong - ? + 3) / 3.0), 1.0) AS vekt
@@ -22,10 +22,11 @@ FROM
   Fotballresultater resultater
   JOIN Fotballdeltagere deltager1 ON resultater.Lagrecno=deltager1.Nr AND resultater.Serie=deltager1.Serie
   JOIN Fotballdeltagere deltager2 ON resultater.Motstander=deltager2.Nr AND resultater.Serie=deltager2.Serie
-  JOIN Fotballserier serier on resultater.Serie=serier.Nr
-WHERE deltager1.Nr > deltager2.nr
+  JOIN Fotballserier serier ON resultater.Serie=serier.Nr
+  JOIN Fotballspraak spraak ON serier.Spraak=spraak.Id
+WHERE deltager1.Nr > deltager2.nr AND kultur=?
 	');
-	$q->execute($last_season);
+	$q->execute($last_season, $locale);
 
 	while (my $ref = $q->fetchrow_hashref) {
 		next if ($ref->{'maalfor'} == 150 && $ref->{'maalmot'} == 0);
@@ -58,7 +59,7 @@ sub output_to_file {
 }
 
 sub train_model {
-	my ($filename, $ratings, $covariances) = @_;
+	my ($filename, $locale, $ratings, $covariances, $aux_params) = @_;
 
 	open RATINGS, "$config::base_dir/bayeswf < $filename |"
 		or die "bayeswf: $!";
@@ -67,6 +68,8 @@ sub train_model {
 		my @x = split;
 		if ($x[0] eq 'covariance') {
 			push @$covariances, (join("\t", @x[1..3]));
+		} elsif ($x[0] eq 'aux_param') {
+			push @$aux_params, ($locale .  "\t" . $x[1] . "\t" . $x[2]);
 		} else {
 			push @$ratings, ($x[2] . "\t" . $x[0] . "\t" . $x[1]);
 		}
@@ -75,6 +78,19 @@ sub train_model {
 	close RATINGS;
 }
 
+sub find_all_locales {
+	my $dbh = shift;
+	my $q = $dbh->prepare('SELECT kultur FROM fotballspraak');
+	$q->execute;
+
+	my @locales = ();
+	while (my $ref = $q->fetchrow_hashref) {
+		push @locales, $ref->{'kultur'};
+	}
+
+	return @locales;
+}
+
 my $dbh = DBI->connect($config::local_connstr, $config::local_username, $config::local_password)
 	or die "connect: " . $DBI::errstr;
 $dbh->{AutoCommit} = 0;
@@ -82,21 +98,22 @@ $dbh->{RaiseError} = 1;
 
 $dbh->do('SET client_min_messages TO WARNING');
 
-my $last_season = find_last_season($dbh);
-my @games = ();
-my %ids = ();
-fetch_games($dbh, $last_season, \@games, \%ids);
-my $tmpnam = output_to_file(\@games, \%ids);
+my @locales = find_all_locales($dbh);
 
 my @ratings = ();
 my @covariances = ();
-train_model($tmpnam, \@ratings, \@covariances);
-unlink($tmpnam);
+my @aux_params = ();
 
-$dbh->do('TRUNCATE ratings');
-$dbh->do('COPY ratings ( id, rating, rating_stddev ) FROM STDIN');
-$dbh->pg_putcopydata(join("\n", @ratings));
-$dbh->pg_putcopyend();
+for my $locale (@locales) {
+	my $last_season = find_last_season($dbh, $locale);
+	my @games = ();
+	my %ids = ();
+	fetch_games($dbh, $locale, $last_season, \@games, \%ids);
+	my $tmpnam = output_to_file(\@games, \%ids);
+
+	train_model($tmpnam, $locale, \@ratings, \@covariances, \@aux_params);
+	unlink($tmpnam);
+}
 
 $dbh->do('CREATE TABLE new_covariance ( player1 smallint NOT NULL, player2 smallint NOT NULL, cov float NOT NULL )');
 $dbh->do('COPY new_covariance ( player1, player2, cov ) FROM STDIN');
@@ -106,4 +123,14 @@ $dbh->do('ALTER TABLE new_covariance ADD PRIMARY KEY ( player1, player2 );');
 $dbh->do('DROP TABLE IF EXISTS covariance');
 $dbh->do('ALTER TABLE new_covariance RENAME TO covariance');
 
+$dbh->do('TRUNCATE aux_params');
+$dbh->do('COPY aux_params ( kultur, id, value ) FROM STDIN');
+$dbh->pg_putcopydata(join("\n", @aux_params));
+$dbh->pg_putcopyend();
+
+$dbh->do('TRUNCATE ratings');
+$dbh->do('COPY ratings ( id, rating, rating_stddev ) FROM STDIN');
+$dbh->pg_putcopydata(join("\n", @ratings));
+$dbh->pg_putcopyend();
+
 $dbh->commit;