Cleanup in tests/: adding namespaces, removing php closing tag and general code cleanup

This commit is contained in:
Alexander Liljengård
2016-05-24 13:59:35 +02:00
parent 4ab0c5d719
commit 983c6dc487
11 changed files with 115 additions and 213 deletions

View File

@ -1,9 +1,4 @@
<?php
namespace Moserware\Skills\Elo;
require_once(dirname(__FILE__) . '/../../Skills/Elo/EloRating.php');
require_once(dirname(__FILE__) . '/../../Skills/GameInfo.php');
require_once(dirname(__FILE__) . '/../../Skills/PairwiseComparison.php');
<?php namespace Moserware\Skills\Tests\Elo;
use Moserware\Skills\GameInfo;
use Moserware\Skills\PairwiseComparison;
@ -11,36 +6,34 @@ use Moserware\Skills\PairwiseComparison;
class EloAssert
{
const ERROR_TOLERANCE = 0.1;
public static function assertChessRating(
$testClass,
$twoPlayerEloCalculator,
$player1BeforeRating,
$player2BeforeRating,
$player1Result,
$player1AfterRating,
$player2AfterRating)
$testClass,
$twoPlayerEloCalculator,
$player1BeforeRating,
$player2BeforeRating,
$player1Result,
$player1AfterRating,
$player2AfterRating)
{
$player1 = "Player1";
$player2 = "Player2";
$teams = array(
array( $player1 => new EloRating($player1BeforeRating) ),
array( $player2 => new EloRating($player2BeforeRating) )
);
$chessGameInfo = new GameInfo(1200, 0, 200);
$ranks = PairwiseComparison::getRankFromComparison($player1Result);
$player1 = "Player1";
$player2 = "Player2";
$result = $twoPlayerEloCalculator->calculateNewRatings(
$chessGameInfo,
$teams,
$ranks);
$testClass->assertEquals($player1AfterRating, $result[$player1]->getMean(), '', self::ERROR_TOLERANCE);
$testClass->assertEquals($player2AfterRating, $result[$player2]->getMean(), '', self::ERROR_TOLERANCE);
}
}
?>
$teams = array(
array($player1 => new EloRating($player1BeforeRating)),
array($player2 => new EloRating($player2BeforeRating))
);
$chessGameInfo = new GameInfo(1200, 0, 200);
$ranks = PairwiseComparison::getRankFromComparison($player1Result);
$result = $twoPlayerEloCalculator->calculateNewRatings(
$chessGameInfo,
$teams,
$ranks);
$testClass->assertEquals($player1AfterRating, $result[$player1]->getMean(), '', self::ERROR_TOLERANCE);
$testClass->assertEquals($player2AfterRating, $result[$player2]->getMean(), '', self::ERROR_TOLERANCE);
}
}

View File

@ -1,21 +1,16 @@
<?php
namespace Moserware\Skills\Elo;
require_once(dirname(__FILE__) . '/EloAssert.php');
require_once(dirname(__FILE__) . '/../../Skills/PairwiseComparison.php');
require_once(dirname(__FILE__) . '/../../Skills/Elo/FideEloCalculator.php');
require_once(dirname(__FILE__) . '/../../Skills/Elo/FideKFactor.php');
<?php namespace Moserware\Skills\Tests\Elo;
use Moserware\Skills\Elo\FideEloCalculator;
use Moserware\Skills\Elo\ProvisionalFideKFactor;
use Moserware\Skills\PairwiseComparison;
use \PHPUnit_Framework_TestCase;
class FideEloCalculatorTest extends PHPUnit_Framework_TestCase
{
{
public function testFideProvisionalEloCalculator()
{
// verified against http://ratings.fide.com/calculator_rtd.phtml
$calc = new FideEloCalculator(new ProvisionalFideKFactor());
EloAssert::assertChessRating($this, $calc, 1200, 1500, PairwiseComparison::WIN, 1221.25, 1478.75);
EloAssert::assertChessRating($this, $calc, 1200, 1500, PairwiseComparison::DRAW, 1208.75, 1491.25);
EloAssert::assertChessRating($this, $calc, 1200, 1500, PairwiseComparison::LOSE, 1196.25, 1503.75);
@ -34,6 +29,4 @@ class FideEloCalculatorTest extends PHPUnit_Framework_TestCase
EloAssert::assertChessRating($this, $calc, 2600, 2500, PairwiseComparison::DRAW, 2598.6, 2501.4);
EloAssert::assertChessRating($this, $calc, 2600, 2500, PairwiseComparison::LOSE, 2593.6, 2506.4);
}
}
?>
}