X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=train.pl;h=119b738dd4cddf322fee45107db587cb4df1dd47;hb=f0910d7eb4a693e3e0808f6f4d034347146686db;hp=d8037db2f615b30b99a8a159aa39cae5092ac9ed;hpb=251cdac7b8327c1ca639ca465b7766c96fc7f2de;p=wloh

diff --git a/train.pl b/train.pl
index d8037db..119b738 100755
--- a/train.pl
+++ b/train.pl
@@ -15,26 +15,8 @@ $dbh->{RaiseError} = 1;
 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 $last_season = $ref->{'sesong'};
 
-my $tmpnam = POSIX::tmpnam();
-open DATA, ">", $tmpnam
-	or die "$tmpnam: $!";
-
-# Fetch name (ID) list
-my $q = $dbh->prepare('SELECT DISTINCT id FROM fotballdeltagere');
-$q->execute();
-my @ids = ();
-while (my $ref = $q->fetchrow_hashref) {
-	my $id = $ref->{'id'};
-	push @ids, $id;
-}
-	
-print DATA scalar @ids, "\n";
-for my $id (@ids) {
-	print DATA $id, "\n";
-}
-
 # Fetch games
-$q = $dbh->prepare('
+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
 FROM
@@ -46,20 +28,40 @@ WHERE deltager1.Nr > deltager2.nr
 ');
 $q->execute($last_season);
 
+my @games = ();
+my %ids = ();
+
 while (my $ref = $q->fetchrow_hashref) {
-	printf DATA "%d %d %d %d %f\n", $ref->{'p1'}, $ref->{'p2'}, $ref->{'maalfor'}, $ref->{'maalmot'}, $ref->{'vekt'};
+	next if ($ref->{'maalfor'} == 150 && $ref->{'maalmot'} == 0);
+	next if ($ref->{'maalfor'} == 0 && $ref->{'maalmot'} == 150);
+	next if ($ref->{'maalfor'} == 150 && $ref->{'maalmot'} == 150);
+	push @games, { %$ref };
+	$ids{$ref->{'p1'}} = 1;
+	$ids{$ref->{'p2'}} = 1;
 }
 
+# Output to file
+my $tmpnam = POSIX::tmpnam();
+open DATA, ">", $tmpnam
+	or die "$tmpnam: $!";
+
+printf DATA "%d\n", scalar keys %ids;
+for my $id (keys %ids) {
+	printf DATA "%d\n", $id;
+}
+for my $ref (@games) {
+	printf DATA "%d %d %d %d %f\n", $ref->{'p1'}, $ref->{'p2'}, $ref->{'maalfor'}, $ref->{'maalmot'}, $ref->{'vekt'};
+}
 close DATA;
 
 $dbh->do('DELETE FROM ratings');
-my $iq = $dbh->prepare('INSERT INTO ratings ( id, rating ) VALUES (?, ?)');
+my $iq = $dbh->prepare('INSERT INTO ratings ( id, rating, rating_stddev ) VALUES (?, ?, ?)');
 
-open RATINGS, "/home/sesse/dev/bayeswf/bayeswf < $tmpnam |"
+open RATINGS, "$config::base_dir/bayeswf < $tmpnam |"
 	or die "bayeswf: $!";
 while (<RATINGS>) {
-	/(.*) (.*)/ or next;
-	$iq->execute($2, $1);
+	/(.*) (.*) (.*)/ or next;
+	$iq->execute($3, $1, $2);
 }
 
 $dbh->commit;