jct/trueskill
1
0
Fork 0
mirror of https://github.com/furyfire/trueskill.git synced 2025-11-04 02:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Pint applied for formatting

Browse Source
This commit is contained in:
Alex Wulf
2022-07-05 15:55:47 +02:00
parent bfc558d1f2
commit 7d4547df6a
68 changed files with 670 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/Numerics/BasicMathTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\Numerics;
<?php
namespace DNW\Skills\Tests\Numerics;
use DNW\Skills\Numerics\BasicMath;
use DNW\Skills\Tests\TestCase;
@@ -11,4 +13,4 @@ class BasicMathTest extends TestCase
$this->assertEquals(1.44, BasicMath::square(1.2));
$this->assertEquals(4, BasicMath::square(2));
}
}
}

6
tests/Numerics/GaussianDistributionTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\Numerics;
<?php
namespace DNW\Skills\Tests\Numerics;
use DNW\Skills\Numerics\BasicMath;
use DNW\Skills\Numerics\GaussianDistribution;
@@ -95,4 +97,4 @@ class GaussianDistributionTest extends TestCase
$absDiff2 = GaussianDistribution::absoluteDifference($m1s2, $m3s4);
$this->assertEqualsWithDelta(0.4330127018922193, $absDiff2, GaussianDistributionTest::ERROR_TOLERANCE);
}
}
}

20
tests/Numerics/MatrixTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\Numerics;
<?php
namespace DNW\Skills\Tests\Numerics;
use DNW\Skills\Numerics\IdentityMatrix;
use DNW\Skills\Numerics\Matrix;
@@ -48,7 +50,7 @@ class MatrixTest extends TestCase
public function testFourByFourDeterminant()
{
$a = new SquareMatrix( 1, 2, 3, 4,
$a = new SquareMatrix(1, 2, 3, 4,
5, 6, 7, 8,
9, 10, 11, 12,
13, 14, 15, 16);
@@ -66,7 +68,7 @@ class MatrixTest extends TestCase
public function testEightByEightDeterminant()
{
$a = new SquareMatrix( 1, 2, 3, 4, 5, 6, 7, 8,
$a = new SquareMatrix(1, 2, 3, 4, 5, 6, 7, 8,
9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32,
@@ -134,19 +136,18 @@ class MatrixTest extends TestCase
$a = new SquareMatrix(1, 2,
3, 4);
$b = new SquareMatrix( 4, -2,
-3, 1);
$b = new SquareMatrix(4, -2,
-3, 1);
$this->assertTrue($b->equals($a->getAdjugate()));
$c = new SquareMatrix(-3, 2, -5,
-1, 0, -2,
3, -4, 1);
$d = new SquareMatrix(-8, 18, -4,
-5, 12, -1,
4, -6, 2);
4, -6, 2);
$this->assertTrue($d->equals($c->getAdjugate()));
}
@@ -175,8 +176,7 @@ class MatrixTest extends TestCase
$cInverse = $c->getInverse();
$d = Matrix::scalarMultiply((1.0 / 22), new SquareMatrix(24, -12, -2,
5, 3, -5,
-4, 2, 4));
-4, 2, 4));
$this->assertTrue($d->equals($cInverse));
$identity3x3 = new IdentityMatrix(3);
@@ -184,4 +184,4 @@ class MatrixTest extends TestCase
$ccInverse = Matrix::multiply($c, $cInverse);
$this->assertTrue($identity3x3->equals($ccInverse));
}
}
}

16
tests/RankSorterTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests;
<?php
namespace DNW\Skills\Tests;
use DNW\Skills\RankSorter;
@@ -6,13 +8,13 @@ class RankSorterTest extends TestCase
{
public function testSort()
{
$team1 = array("a" => 1, "b" => 2);
$team2 = array("c" => 3, "d" => 4);
$team3 = array("e" => 5, "f" => 6);
$team1 = ['a' => 1, 'b' => 2];
$team2 = ['c' => 3, 'd' => 4];
$team3 = ['e' => 5, 'f' => 6];
$teams = array($team1, $team2, $team3);
$teams = [$team1, $team2, $team3];
$teamRanks = array(3, 1, 2);
$teamRanks = [3, 1, 2];
$sortedRanks = RankSorter::sort($teams, $teamRanks);
@@ -30,4 +32,4 @@ class RankSorterTest extends TestCase
$this->assertEquals($teams[1], $sortedRanks[1]);
$this->assertEquals($teams[2], $sortedRanks[2]);
}
}
}

6
tests/TestCase.php
View File

@@ -1,5 +1,7 @@
<?php namespace DNW\Skills\Tests;
<?php
namespace DNW\Skills\Tests;
class TestCase extends \PHPUnit\Framework\TestCase
{
}
}

6
tests/TrueSkill/DrawMarginTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\TrueSkill;
<?php
namespace DNW\Skills\Tests\TrueSkill;
use DNW\Skills\Tests\TestCase;
use DNW\Skills\TrueSkill\DrawMargin;
@@ -21,4 +23,4 @@ class DrawMarginTest extends TestCase
$actual = DrawMargin::getDrawMarginFromDrawProbability($drawProbability, $beta);
$this->assertEqualsWithDelta($expected, $actual, DrawMarginTest::ERROR_TOLERANCE);
}
}
}

6
tests/TrueSkill/FactorGraphTeamTrueSkillCalculatorTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\TrueSkill;
<?php
namespace DNW\Skills\Tests\TrueSkill;
use DNW\Skills\Tests\TestCase;
use DNW\Skills\TrueSkill\FactorGraphTrueSkillCalculator;
@@ -14,4 +16,4 @@ class FactorGraphTeamTrueSkillCalculatorTest extends TestCase
TrueSkillCalculatorTests::testAllMultipleTeamScenarios($this, $calculator);
TrueSkillCalculatorTests::testPartialPlayScenarios($this, $calculator);
}
}
}

69
tests/TrueSkill/TrueSkillCalculatorTests.php
View File

@@ -1,15 +1,18 @@
<?php namespace DNW\Skills\Tests\TrueSkill;
<?php
namespace DNW\Skills\Tests\TrueSkill;
use DNW\Skills\GameInfo;
use DNW\Skills\Player;
use DNW\Skills\Rating;
use DNW\Skills\SkillCalculator;
use DNW\Skills\Team;
use DNW\Skills\Teams;
use DNW\Skills\SkillCalculator;
class TrueSkillCalculatorTests
{
const ERROR_TOLERANCE_TRUESKILL = 0.085;
const ERROR_TOLERANCE_MATCH_QUALITY = 0.0005;
// These are the roll-up ones
@@ -79,10 +82,10 @@ class TrueSkillCalculatorTests
$gameInfo = new GameInfo();
$team1 = new Team($player1, $gameInfo->getDefaultRating());
$team2 = new Team($player2, $gameInfo->getDefaultRating());;
$team2 = new Team($player2, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 29.39583201999924, 7.171475587326186, $player1NewRating);
@@ -104,7 +107,7 @@ class TrueSkillCalculatorTests
$team2 = new Team($player2, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 25.0, 6.4575196623173081, $player1NewRating);
@@ -125,7 +128,7 @@ class TrueSkillCalculatorTests
$team1 = new Team($player1, new Rating(1301.0007, 42.9232));
$team2 = new Team($player2, new Rating(1188.7560, 42.5570));
$newRatings = $calculator->calculateNewRatings($gameInfo, Teams::concat($team1, $team2), array(1, 2));
$newRatings = $calculator->calculateNewRatings($gameInfo, Teams::concat($team1, $team2), [1, 2]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 1304.7820836053318, 42.843513887848658, $player1NewRating);
@@ -148,7 +151,7 @@ class TrueSkillCalculatorTests
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
// Winners
self::assertRating($testClass, 31.662, 7.137, $newRatingsWinLose->getRating($player1));
@@ -180,7 +183,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player3, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 33.730, 7.317, $newRatingsWinLose->getRating($player1));
@@ -215,7 +218,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 28.108, 7.774, $newRatingsWinLose->getRating($player1));
@@ -245,7 +248,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player3, new Rating(25, 8));
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 42.744, 5.602, $newRatingsWinLose->getRating($player1));
@@ -276,7 +279,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 36.337, 7.527, $newRatingsWinLose->getRating($player1));
@@ -296,7 +299,7 @@ class TrueSkillCalculatorTests
$gameInfo = new GameInfo();
$team1 = new Team();
$team1->addPlayer($player1, $gameInfo->getDefaultRating());;
$team1->addPlayer($player1, $gameInfo->getDefaultRating());
$player2 = new Player(2);
$player3 = new Player(3);
@@ -306,7 +309,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player3, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
// Winners
self::assertRating($testClass, 31.660, 7.138, $newRatingsWinLose->getRating($player1));
@@ -337,7 +340,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
// Winners
self::assertRating($testClass, 34.990, 7.455, $newRatingsWinLose->getRating($player1));
@@ -377,7 +380,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player8, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 40.582, 7.917, $newRatingsWinLose->getRating($player1));
@@ -405,7 +408,6 @@ class TrueSkillCalculatorTests
$team1->addPlayer($player2, new Rating(27, 6));
$team1->addPlayer($player3, new Rating(26, 5));
$player4 = new Player(4);
$player5 = new Player(5);
@@ -416,7 +418,7 @@ class TrueSkillCalculatorTests
$gameInfo = new GameInfo();
$teams = Teams::concat($team1, $team2);
$newRatingsWinLoseExpected = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLoseExpected = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 28.658, 6.770, $newRatingsWinLoseExpected->getRating($player1));
@@ -427,7 +429,7 @@ class TrueSkillCalculatorTests
self::assertRating($testClass, 29.785, 3.958, $newRatingsWinLoseExpected->getRating($player4));
self::assertRating($testClass, 30.879, 2.983, $newRatingsWinLoseExpected->getRating($player5));
$newRatingsWinLoseUpset = $calculator->calculateNewRatings($gameInfo, Teams::concat($team1, $team2), array(2, 1));
$newRatingsWinLoseUpset = $calculator->calculateNewRatings($gameInfo, Teams::concat($team1, $team2), [2, 1]);
// Winners
self::assertRating($testClass, 32.012, 3.877, $newRatingsWinLoseUpset->getRating($player4));
@@ -460,7 +462,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, new Rating(30, 3));
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
// Winners
self::assertRating($testClass, 21.570, 6.556, $newRatingsWinLose->getRating($player1));
@@ -492,7 +494,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, new Rating(40, 5));
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 29.698, 7.008, $newRatingsWinLose->getRating($player1));
@@ -518,7 +520,7 @@ class TrueSkillCalculatorTests
$team1->addPlayer($player1, $gameInfo->getDefaultRating());
$team1->addPlayer($player2, $gameInfo->getDefaultRating());
$team1->addPlayer($player3, $gameInfo->getDefaultRating());
$team1->addPlayer($player4, $gameInfo->getDefaultRating());;
$team1->addPlayer($player4, $gameInfo->getDefaultRating());
$player5 = new Player(5);
$player6 = new Player(6);
@@ -533,7 +535,7 @@ class TrueSkillCalculatorTests
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
// Winners
self::assertRating($testClass, 27.198, 8.059, $newRatingsWinLose->getRating($player1));
@@ -569,7 +571,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($player4, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1]);
// Winners
self::assertRating($testClass, 25, 7.455, $newRatingsWinLose->getRating($player1));
@@ -582,7 +584,6 @@ class TrueSkillCalculatorTests
self::assertMatchQuality($testClass, 0.447, $calculator->calculateMatchQuality($gameInfo, $teams));
}
private static function threeTeamsOfOneNotDrawn($testClass, SkillCalculator $calculator)
{
$player1 = new Player(1);
@@ -596,7 +597,7 @@ class TrueSkillCalculatorTests
$team3 = new Team($player3, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2, $team3);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2, 3));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2, 3]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 31.675352419172107, 6.6559853776206905, $player1NewRating);
@@ -623,7 +624,7 @@ class TrueSkillCalculatorTests
$team3 = new Team($player3, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2, $team3);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1, 1));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1, 1]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 25.000, 5.698, $player1NewRating);
@@ -652,7 +653,7 @@ class TrueSkillCalculatorTests
$teams = Teams::concat($team1, $team2, $team3, $team4);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2, 3, 4));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2, 3, 4]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 33.206680965631264, 6.3481091698077057, $player1NewRating);
@@ -685,7 +686,7 @@ class TrueSkillCalculatorTests
$team5 = new Team($player5, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2, $team3, $team4, $team5);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2, 3, 4, 5));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2, 3, 4, 5]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 34.363135705841188, 6.1361528798112692, $player1NewRating);
@@ -727,7 +728,7 @@ class TrueSkillCalculatorTests
$team8 = new Team($player8, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2, $team3, $team4, $team5, $team6, $team7, $team8);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 1, 1, 1, 1, 1, 1, 1));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 1, 1, 1, 1, 1, 1, 1]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 25.000, 4.592, $player1NewRating);
@@ -779,7 +780,7 @@ class TrueSkillCalculatorTests
$team8 = new Team($player8, new Rating(45, 1));
$teams = Teams::concat($team1, $team2, $team3, $team4, $team5, $team6, $team7, $team8);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2, 3, 4, 5, 6, 7, 8));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2, 3, 4, 5, 6, 7, 8]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 35.135, 4.506, $player1NewRating);
@@ -854,7 +855,7 @@ class TrueSkillCalculatorTests
$newRatings = $calculator->calculateNewRatings(
$gameInfo, $teams,
array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16));
[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]);
$player1NewRating = $newRatings->getRating($player1);
self::assertRating($testClass, 40.53945776946920, 5.27581643889050, $player1NewRating);
@@ -935,7 +936,7 @@ class TrueSkillCalculatorTests
$team3->addPlayer($player8, new Rating(30, 2));
$teams = Teams::concat($team1, $team2, $team3);
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2, 2));
$newRatingsWinLose = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2, 2]);
// Winners
self::assertRating($testClass, 40.877, 3.840, $newRatingsWinLose->getRating($player1));
@@ -969,7 +970,7 @@ class TrueSkillCalculatorTests
$team2->addPlayer($p3, $gameInfo->getDefaultRating());
$teams = Teams::concat($team1, $team2);
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, array(1, 2));
$newRatings = $calculator->calculateNewRatings($gameInfo, $teams, [1, 2]);
$p1NewRating = $newRatings->getRating($p1);
$p2NewRating = $newRatings->getRating($p2);
@@ -994,4 +995,4 @@ class TrueSkillCalculatorTests
{
$testClass->assertEquals($expectedMatchQuality, $actualMatchQuality, '', self::ERROR_TOLERANCE_MATCH_QUALITY);
}
}
}

6
tests/TrueSkill/TwoPlayerTrueSkillCalculatorTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\TrueSkill;
<?php
namespace DNW\Skills\Tests\TrueSkill;
use DNW\Skills\Tests\TestCase;
use DNW\Skills\TrueSkill\TwoPlayerTrueSkillCalculator;
@@ -12,4 +14,4 @@ class TwoPlayerTrueSkillCalculatorTest extends TestCase
// We only support two players
TrueSkillCalculatorTests::testAllTwoPlayerScenarios($this, $calculator);
}
}
}

6
tests/TrueSkill/TwoTeamTrueSkillCalculatorTest.php
View File

@@ -1,4 +1,6 @@
<?php namespace DNW\Skills\Tests\TrueSkill;
<?php
namespace DNW\Skills\Tests\TrueSkill;
use DNW\Skills\Tests\TestCase;
use DNW\Skills\TrueSkill\TwoTeamTrueSkillCalculator;
@@ -13,4 +15,4 @@ class TwoTeamTrueSkillCalculatorTest extends TestCase
TrueSkillCalculatorTests::testAllTwoPlayerScenarios($this, $calculator);
TrueSkillCalculatorTests::testAllTwoTeamScenarios($this, $calculator);
}
}
}