Small optimization to copy_escape.

[wloh] / train.pl

diff --git a/train.pl b/train.pl
index 19d9271455a509d7392ae70e1342bf4e4382c7f3..84335e15ee6b459486f51dcf170351ab3a363319 100755 (executable)
--- a/train.pl
+++ b/train.pl
@@ -4,7 +4,9 @@ use strict;
 use warnings;
 no warnings qw(once);
 use POSIX;
-require './config.pm';
+use lib qw( include );
+require 'config.pm';
+require 'common.pm';
 
 # Find last completely done season 
 sub find_last_season {
@@ -19,7 +21,7 @@ sub fetch_games {
 SELECT
   deltager1.id as p1, deltager2.id as p2, maalfor, maalmot, least(pow(2.0, (sesong - ? + 3) / 3.0), 1.0) AS vekt
 FROM
-  Fotballresultater resultater
+  ( SELECT * FROM fotballresultater UNION ALL SELECT * FROM fotballresultater_2123 ) 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
@@ -78,19 +80,6 @@ sub train_model {
        close RATINGS;
 }
 
-sub find_all_locales {
-       my $dbh = shift;
-       my $q = $dbh->prepare('SELECT kultur FROM fotballspraak WHERE nyestesesong<>-1');
-       $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;
@@ -98,7 +87,7 @@ $dbh->{RaiseError} = 1;
 
 $dbh->do('SET client_min_messages TO WARNING');
 
-my @locales = find_all_locales($dbh);
+my @locales = wloh_common::find_all_locales($dbh);
 
 my @ratings = ();
 my @covariances = ();