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

[foosball] / foosball.pm

diff --git a/foosball.pm b/foosball.pm
index 164b3e3d4c6381cb308b583e9a129c502b8f12ad..dc5ff223d4c70b82493dbd2a067b3f62d8b930e7 100644 (file)
--- a/foosball.pm
+++ b/foosball.pm
@@ -15,6 +15,12 @@ sub find_single_rating {
        my ($age, $rating, $rd) = $dbh->selectrow_array('SELECT EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP-ratetime)), rating, rd FROM single_rating WHERE username=? '.$limit.' ORDER BY ratetime DESC LIMIT 1',
                undef, $username);
        $rd = apply_aging($rd, $age / 86400.0);
+
+       if (!defined($rating)) {
+               $rating = 1500;
+               $rd = 350;
+       }
+
        return ($rating, $rd);
 }
 
@@ -23,9 +29,23 @@ sub find_double_rating {
        my ($age, $rating, $rd) = $dbh->selectrow_array('SELECT EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP-ratetime)), rating, rd FROM double_rating WHERE username=? '.$limit.'ORDER BY ratetime DESC LIMIT 1',
                undef, $username);
        $rd = apply_aging($rd, $age / 86400.0);
+       
+       if (!defined($rating)) {
+               $rating = 1500;
+               $rd = 350;
+       }
+
        return ($rating, $rd);
 }
 
+sub combine_ratings {
+       my ($rating1, $rd1, $rating2, $rd2) = @_;
+
+       my $rating_team = 0.5 * ($rating1 + $rating2);
+       my $rd_team = sqrt($rd1 * $rd1 + $rd2 * $rd2) / sqrt(2.0);
+       return ($rating_team, $rd_team);
+}
+
 sub create_user_if_not_exists {
        my ($dbh, $username) = @_;
        my $count = $dbh->selectrow_array('SELECT count(*) FROM users WHERE username=?',
@@ -40,21 +60,6 @@ sub create_user_if_not_exists {
        return $dbh;
 }
 
-# 10-9 is 0.60
-# 10-0 is 1.00
-sub find_score {
-       my ($score1, $score2) = @_;
-       if ($score1 == 10) {
-               # yay, a win
-               return 0.60 + 0.40 * (9.0-$score2)/9.0;
-       }
-       if ($score2 == 10) {
-               # a loss
-               return 0.40 - 0.40 * (9.0-$score1)/9.0;
-       }
-       die "Nobody won?";
-}
-
 # c=8 => RD=50 moves to RD=350 over approx. five years
 our $c = 8;
 
@@ -65,38 +70,11 @@ sub apply_aging {
        return $rd;
 }
 
-our $q = log(10)/400.0;
-our $pi = 3.1415926535897932384626433832795;
-
-# computes a^b
-sub pow {
-       my ($a, $b) = @_;
-
-       # a^b = exp(log(a^b)) = exp(b log a)
-       return exp($b * log($a));
-}
-
-sub g {
-       my $rd = shift;
-       return 1.0 / sqrt(1.0 + 3.0 * $q * $q * $rd * $rd / ($pi*$pi));
-}
-
-sub E {
-       my ($r, $rating, $rd) = @_;
-       return 1.0 / (1.0 + pow(10.0, - g($rd) * ($r - $rating) / 400.0));
-}
-
-sub dsq {
-       my ($r, $rating, $rd) = @_;
-       return 1.0 / ($q*$q * g($rd) * g($rd) * E($r, $rating, $rd) * (1 - E($r, $rating, $rd)));
-}
-
 sub calc_rating {
        my ($rating1, $rd1, $rating2, $rd2, $score1, $score2) = @_;
-       my $s1 = find_score($score1, $score2);
-       my $d1sq = dsq($rating1, $rating2, $rd2);
-       my $newr1 = $rating1 + ($q / (1.0/($rd1*$rd1) + 1.0 / $d1sq)) * g($rd2) * ($s1 - E($rating1, $rating2, $rd2));
-       my $newrd1 = sqrt(1.0 / (1.0 / ($rd1*$rd1) + 1.0 / $d1sq));
+       my $result = `/srv/foosball.sesse.net/foosrank $rating1 $rd1 $rating2 $rd2 $score1 $score2`;
+       chomp $result;
+       my ($newr1, $newrd1) = split / /, $result;
 
        $newrd1 = 30.0 if ($newrd1 < 30.0);