Switch to the standard normalization of the logistic pdf. Much more consistent

[foosball] / foosball.pm

diff --git a/foosball.pm b/foosball.pm
index 9c3821834525e665d2b1fddeb6e13adbd18fb015..b40b9fda17b82ac92e7c97586ac65bb7ebc99d5b 100644 (file)
--- a/foosball.pm
+++ b/foosball.pm
@@ -19,6 +19,7 @@ sub round {
 
 sub find_single_rating {
        my ($dbh, $username, $limit) = @_;
+       $limit = "" if (!defined($limit));
        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);
@@ -33,6 +34,7 @@ sub find_single_rating {
 
 sub find_double_rating {
        my ($dbh, $username, $limit) = @_;
+       $limit = "" if (!defined($limit));
        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);
@@ -45,14 +47,6 @@ sub find_double_rating {
        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=?',
@@ -81,11 +75,11 @@ sub calc_rating {
        my ($rating1, $rd1, $rating2, $rd2, $score1, $score2) = @_;
        my $result = `/srv/foosball.sesse.net/foosrank $rating1 $rd1 $rating2 $rd2 $score1 $score2`;
        chomp $result;
-       my ($newr1, $newrd1) = split / /, $result;
+       my ($newr1, $newrd1, $likelihood) = split / /, $result;
 
        $newrd1 = 30.0 if ($newrd1 < 30.0);
 
-       return ($newr1, $newrd1);
+       return ($newr1, $newrd1, $likelihood);
 }
 
 sub calc_rating_double {