Make the recalc stuff age the RDs properly.

diff --git a/recalc-double-result.pl b/recalc-double-result.pl
index 7395800b15a2820207f41f24cab4f07f554c8852..a6848d2b2f93e419c6981c1d28b38157a79aa155 100755 (executable)
--- a/recalc-double-result.pl
+++ b/recalc-double-result.pl
@@ -12,25 +12,38 @@ $dbh->{AutoCommit} = 0;
 $dbh->do('delete from double_rating');
 
 my %ratings = ();
-my $q = $dbh->prepare('select * from double_results order by gametime');
+my $q = $dbh->prepare('select *,extract(epoch from gametime) as eptime from double_results order by gametime');
 $q->execute;
 
 while (my $ref = $q->fetchrow_hashref) {
        for my $user (($ref->{'team1_username1'}, $ref->{'team1_username2'},
                       $ref->{'team2_username1'}, $ref->{'team2_username2'})) {
                if (!exists($ratings{$user})) {
-                       $ratings{$user} = [ 1500, 350 ];
+                       $ratings{$user} = [ 1500, 350, 0 ];
                }
        }
        
        my $rating1_1 = $ratings{$ref->{'team1_username1'}}->[0];
        my $rd1_1 = $ratings{$ref->{'team1_username1'}}->[1];
+       my $age1_1 = $ref->{'eptime'} - $ratings{$ref->{'team1_username1'}}->[2];
+
        my $rating1_2 = $ratings{$ref->{'team1_username2'}}->[0];
        my $rd1_2 = $ratings{$ref->{'team1_username2'}}->[1];
+       my $age1_2 = $ref->{'eptime'} - $ratings{$ref->{'team1_username2'}}->[2];
+
        my $rating2_1 = $ratings{$ref->{'team2_username1'}}->[0];
        my $rd2_1 = $ratings{$ref->{'team2_username1'}}->[1];
+       my $age2_1 = $ref->{'eptime'} - $ratings{$ref->{'team2_username1'}}->[2];
+
        my $rating2_2 = $ratings{$ref->{'team2_username2'}}->[0];
        my $rd2_2 = $ratings{$ref->{'team2_username2'}}->[1];
+       my $age2_2 = $ref->{'eptime'} - $ratings{$ref->{'team2_username2'}}->[2];
+       
+       $rd1_1 = foosball::apply_aging($rd1_1, $age1_1 / 86400.0);
+       $rd1_2 = foosball::apply_aging($rd1_2, $age1_2 / 86400.0);
+       $rd2_1 = foosball::apply_aging($rd2_1, $age2_1 / 86400.0);
+       $rd2_2 = foosball::apply_aging($rd2_2, $age2_2 / 86400.0);
+
        my $score1 = $ref->{'score1'};
        my $score2 = $ref->{'score2'};
 
@@ -67,10 +80,10 @@ while (my $ref = $q->fetchrow_hashref) {
        $dbh->do('insert into double_rating values (?,?,?,?)', undef,
                $ref->{'team2_username2'}, $ref->{'gametime'}, $newr2_2, $newrd2_2);
 
-       $ratings{$ref->{'team1_username1'}} = [ $newr1_1, $newrd1_1 ];
-       $ratings{$ref->{'team1_username2'}} = [ $newr1_2, $newrd1_2 ];
-       $ratings{$ref->{'team2_username1'}} = [ $newr2_1, $newrd2_1 ];
-       $ratings{$ref->{'team2_username2'}} = [ $newr2_2, $newrd2_2 ];
+       $ratings{$ref->{'team1_username1'}} = [ $newr1_1, $newrd1_1, $ref->{'eptime'} ];
+       $ratings{$ref->{'team1_username2'}} = [ $newr1_2, $newrd1_2, $ref->{'eptime'} ];
+       $ratings{$ref->{'team2_username1'}} = [ $newr2_1, $newrd2_1, $ref->{'eptime'} ];
+       $ratings{$ref->{'team2_username2'}} = [ $newr2_2, $newrd2_2, $ref->{'eptime'} ];
 }
 
 $dbh->commit;

diff --git a/recalc-single-result.pl b/recalc-single-result.pl
index 8c981c2b84c72d1c24d0da944ba367b4576ffe95..02f421b899b5bef903db0074abe8ba3a2d13d5e2 100755 (executable)
--- a/recalc-single-result.pl
+++ b/recalc-single-result.pl
@@ -12,23 +12,30 @@ $dbh->{AutoCommit} = 0;
 $dbh->do('delete from single_rating');
 
 my %ratings = ();
-my $q = $dbh->prepare('select * from single_results order by gametime');
+my $q = $dbh->prepare('select *,extract(epoch from gametime) as eptime from single_results order by gametime');
 $q->execute;
 
 while (my $ref = $q->fetchrow_hashref) {
        for my $user (($ref->{'username1'}, $ref->{'username2'})) {
                if (!exists($ratings{$user})) {
-                       $ratings{$user} = [ 1500, 350 ];
+                       $ratings{$user} = [ 1500, 350, 0 ];
                }
        }
        
        my $rating1 = $ratings{$ref->{'username1'}}->[0];
        my $rd1 = $ratings{$ref->{'username1'}}->[1];
+       my $age1 = $ref->{'eptime'} - $ratings{$ref->{'username1'}}->[2];
+
        my $rating2 = $ratings{$ref->{'username2'}}->[0];
        my $rd2 = $ratings{$ref->{'username2'}}->[1];
+       my $age2 = $ref->{'eptime'} - $ratings{$ref->{'username2'}}->[2];
+
        my $score1 = $ref->{'score1'};
        my $score2 = $ref->{'score2'};
 
+       $rd1 = foosball::apply_aging($rd1, $age1 / 86400.0);
+       $rd2 = foosball::apply_aging($rd2, $age2 / 86400.0);
+
        my ($newr1, $newrd1) = foosball::calc_rating($rating1, $rd1, $rating2, $rd2, $score1, $score2);
        my ($newr2, $newrd2) = foosball::calc_rating($rating2, $rd2, $rating1, $rd1, $score2, $score1);
 
@@ -40,8 +47,8 @@ while (my $ref = $q->fetchrow_hashref) {
        $dbh->do('insert into single_rating values (?,?,?,?)', undef,
                $ref->{'username2'}, $ref->{'gametime'}, $newr2, $newrd2);
 
-       $ratings{$ref->{'username1'}} = [ $newr1, $newrd1 ];
-       $ratings{$ref->{'username2'}} = [ $newr2, $newrd2 ];
+       $ratings{$ref->{'username1'}} = [ $newr1, $newrd1, $ref->{'eptime'} ];
+       $ratings{$ref->{'username2'}} = [ $newr2, $newrd2, $ref->{'eptime'} ];
 }
 
 $dbh->commit;