X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=foosball.pm;h=b5750b26bda09db32f750af5d8a3ea8458906eba;hb=2267ce0f1f55deb019db7d2634c4ff9c62e4988d;hp=9c3821834525e665d2b1fddeb6e13adbd18fb015;hpb=1f8489da48b9721d9c44b97749078a94b935a7b2;p=foosball

diff --git a/foosball.pm b/foosball.pm
index 9c38218..b5750b2 100644
--- a/foosball.pm
+++ b/foosball.pm
@@ -5,6 +5,9 @@ use POSIX;
 
 package foosball;
 
+our $initial_rating = 1500.0;
+our $initial_rd = 350.0;
+
 sub db_connect {
 	my $dbh = DBI->connect("dbi:Pg:dbname=foosball;host=127.0.0.1", "foosball", "cleanrun", {AutoCommit => 0});
 	$dbh->{RaiseError} = 1;
@@ -19,13 +22,14 @@ 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);
 
 	if (!defined($rating)) {
-		$rating = 1500;
-		$rd = 350;
+		$rating = $initial_rating;
+		$rd = $initial_rd;
 	}
 
 	return ($rating, $rd);
@@ -33,26 +37,19 @@ 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);
 	
 	if (!defined($rating)) {
-		$rating = 1500;
-		$rd = 350;
+		$rating = $initial_rating;
+		$rd = $initial_rd;
 	}
 
 	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=?',
@@ -60,10 +57,10 @@ sub create_user_if_not_exists {
 	return if ($count > 0);
 	$dbh->do('INSERT INTO users (username) VALUES (?)',
 		undef, $username);
-	$dbh->do('INSERT INTO single_rating (username,ratetime,rating,rd) VALUES (?,CURRENT_TIMESTAMP,1500.0,350.0)',
-		undef, $username);
-	$dbh->do('INSERT INTO double_rating (username,ratetime,rating,rd) VALUES (?,CURRENT_TIMESTAMP,1500.0,350.0)',
-		undef, $username);
+	$dbh->do('INSERT INTO single_rating (username,ratetime,rating,rd) VALUES (?,CURRENT_TIMESTAMP,?,?)',
+		undef, $username, $initial_rating, $initial_rd);
+	$dbh->do('INSERT INTO double_rating (username,ratetime,rating,rd) VALUES (?,CURRENT_TIMESTAMP,?,?)',
+		undef, $username, $initial_rating, $initial_rd);
 	return $dbh;
 }
 
@@ -73,7 +70,7 @@ our $c = 8;
 sub apply_aging {
 	my ($rd, $age) = @_;
 	$rd = sqrt($rd*$rd + $c * $c * ($age / 86400.0));
-	$rd = 350.0 if ($rd > 350.0);
+	$rd = $initial_rd if ($rd > $initial_rd);
 	return $rd;
 }
 
@@ -81,11 +78,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 {