Support k != 10, ie. the new table.

[foosball] / recalc-double-result.pl

diff --git a/recalc-double-result.pl b/recalc-double-result.pl
index a6848d2b2f93e419c6981c1d28b38157a79aa155..2ccb6a7428430db97079ca1f25d96f7ba487292f 100755 (executable)
--- a/recalc-double-result.pl
+++ b/recalc-double-result.pl
@@ -48,10 +48,8 @@ while (my $ref = $q->fetchrow_hashref) {
        my $score2 = $ref->{'score2'};
 
        # make virtual "team players"
-       my $rating_team1 = 0.5 * ($rating1_1 + $rating1_2);
-       my $rd_team1 = sqrt($rd1_1 * $rd1_1 + $rd1_2 * $rd1_2) / sqrt(2.0);
-       my $rating_team2 = 0.5 * ($rating1_2 + $rating2_2);
-       my $rd_team2 = sqrt($rd2_1 * $rd2_1 + $rd2_2 * $rd2_2) / sqrt(2.0);
+       my ($rating_team1, $rd_team1) = foosball::combine_ratings($rating1_1, $rd1_1, $rating1_2, $rd1_2);
+       my ($rating_team2, $rd_team2) = foosball::combine_ratings($rating2_1, $rd2_1, $rating2_2, $rd2_2);
 
        my ($new_t1r, undef) =  foosball::calc_rating($rating_team1, $rd_team1, $rating_team2, $rd_team2, $score1, $score2);
        my ($new_t2r, undef) =  foosball::calc_rating($rating_team2, $rd_team2, $rating_team1, $rd_team1, $score2, $score1);
@@ -71,14 +69,14 @@ while (my $ref = $q->fetchrow_hashref) {
                $ref->{'score1'}, $ref->{'score2'},
                $newr1_1, $newrd1_1, $newr1_2, $newrd1_2,
                $newr2_1, $newrd2_1, $newr2_2, $newrd2_2);
-       $dbh->do('insert into double_rating values (?,?,?,?)', undef,
-               $ref->{'team1_username1'}, $ref->{'gametime'}, $newr1_1, $newrd1_1);
-       $dbh->do('insert into double_rating values (?,?,?,?)', undef,
-               $ref->{'team1_username2'}, $ref->{'gametime'}, $newr1_2, $newrd1_2);
-       $dbh->do('insert into double_rating values (?,?,?,?)', undef,
-               $ref->{'team2_username1'}, $ref->{'gametime'}, $newr2_1, $newrd2_1);
-       $dbh->do('insert into double_rating values (?,?,?,?)', undef,
-               $ref->{'team2_username2'}, $ref->{'gametime'}, $newr2_2, $newrd2_2);
+       $dbh->do('insert into double_rating values (?,?,?,?,?)', undef,
+               $ref->{'team1_username1'}, $ref->{'gametime'}, $newr1_1, $newrd1_1, $newr1_1-$rating1_1);
+       $dbh->do('insert into double_rating values (?,?,?,?,?)', undef,
+               $ref->{'team1_username2'}, $ref->{'gametime'}, $newr1_2, $newrd1_2, $newr1_2-$rating1_2);
+       $dbh->do('insert into double_rating values (?,?,?,?,?)', undef,
+               $ref->{'team2_username1'}, $ref->{'gametime'}, $newr2_1, $newrd2_1, $newr2_1-$rating2_1);
+       $dbh->do('insert into double_rating values (?,?,?,?,?)', undef,
+               $ref->{'team2_username2'}, $ref->{'gametime'}, $newr2_2, $newrd2_2, $newr2_2-$rating2_2);
 
        $ratings{$ref->{'team1_username1'}} = [ $newr1_1, $newrd1_1, $ref->{'eptime'} ];
        $ratings{$ref->{'team1_username2'}} = [ $newr1_2, $newrd1_2, $ref->{'eptime'} ];