Switch to more accurate double score calculation.

[foosball] / www / add-double-result.pl

diff --git a/www/add-double-result.pl b/www/add-double-result.pl
index 9b65aff120b5f34738d64e61a4dd23cd954362f3..8efd9b53c477c69c57a3ca414c97be2333485a2f 100755 (executable)
--- a/www/add-double-result.pl
+++ b/www/add-double-result.pl
@@ -47,23 +47,11 @@ my ($rating1_2, $rd1_2) = foosball::find_double_rating($dbh, $team1_username2);
 my ($rating2_1, $rd2_1) = foosball::find_double_rating($dbh, $team2_username1);
 my ($rating2_2, $rd2_2) = foosball::find_double_rating($dbh, $team2_username2);
 
+my ($newr1_1, $newrd1_1) = foosball::calc_rating_double($rating1_1, $rd1_1, $rating1_2, $rd1_2, $rating2_1, $rd2_1, $rating2_2, $rd2_2, $score1, $score2);
+my ($newr1_2, $newrd1_2) = foosball::calc_rating_double($rating1_2, $rd1_2, $rating1_1, $rd1_1, $rating2_1, $rd2_1, $rating2_2, $rd2_2, $score1, $score2);
+my ($newr2_1, $newrd2_1) = foosball::calc_rating_double($rating2_1, $rd2_1, $rating2_2, $rd2_2, $rating1_1, $rd1_1, $rating1_2, $rd1_2, $score2, $score1);
+my ($newr2_2, $newrd2_2) = foosball::calc_rating_double($rating2_2, $rd2_2, $rating2_1, $rd2_1, $rating1_1, $rd1_1, $rating1_2, $rd1_2, $score2, $score1);
 # make virtual "team players"
-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;
-
-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);
-my $newr1_1 = $rating1_1 + ($new_t1r - $rating_team1);
-my $newr1_2 = $rating1_2 + ($new_t1r - $rating_team1);
-my $newr2_1 = $rating2_1 + ($new_t2r - $rating_team2);
-my $newr2_2 = $rating2_2 + ($new_t2r - $rating_team2);
-
-my (undef, $newrd1_1) = foosball::calc_rating($rating1_1, $rd1_1, $rating_team2, $rd_team2, $score1, $score2);
-my (undef, $newrd1_2) = foosball::calc_rating($rating1_2, $rd1_2, $rating_team2, $rd_team2, $score1, $score2);
-my (undef, $newrd2_1) = foosball::calc_rating($rating2_1, $rd2_1, $rating_team1, $rd_team1, $score2, $score1);
-my (undef, $newrd2_2) = foosball::calc_rating($rating2_2, $rd2_2, $rating_team1, $rd_team1, $score2, $score1);
 
 $dbh->do('INSERT INTO double_results (gametime,team1_username1,team1_username2,team2_username1,team2_username2,score1,score2) VALUES (CURRENT_TIMESTAMP,?,?,?,?,?,?)',
        undef, $team1_username1, $team1_username2, $team2_username1, $team2_username2, $score1, $score2);