From 1bd5b77a00fcefdf9f5c33a92bdfa1a1bf3b9291 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 5 Oct 2007 18:43:56 +0200 Subject: [PATCH] Split out the team rating calculation into a separate function. --- recalc-double-result.pl | 6 ++---- www/add-double-result.pl | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/recalc-double-result.pl b/recalc-double-result.pl index a6848d2..388a177 100755 --- 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); diff --git a/www/add-double-result.pl b/www/add-double-result.pl index e0f9974..07cefa8 100755 --- a/www/add-double-result.pl +++ b/www/add-double-result.pl @@ -48,10 +48,8 @@ my ($rating2_1, $rd2_1) = foosball::find_double_rating($dbh, $team2_username1); my ($rating2_2, $rd2_2) = foosball::find_double_rating($dbh, $team2_username2); # 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 $q = $foosball::q; -- 2.39.2