mirror of
https://github.com/furyfire/trueskill.git
synced 2025-03-20 00:37:48 +00:00
Fixed up older calculators and started some file cleanup
This commit is contained in:
@ -35,7 +35,7 @@ class HashMap
|
||||
}
|
||||
|
||||
public function count()
|
||||
{
|
||||
{
|
||||
return \count($this->_hashToKey);
|
||||
}
|
||||
|
||||
|
@ -39,7 +39,7 @@ class RatingContainer
|
||||
|
||||
public function count()
|
||||
{
|
||||
return \count($this->_playerToRating->count());
|
||||
return $this->_playerToRating->count();
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
@ -14,7 +14,7 @@ abstract class SkillCalculator
|
||||
private $_playersPerTeamAllowed;
|
||||
private $_totalTeamsAllowed;
|
||||
|
||||
protected function __construct($supportedOptions, TeamsRange &$totalTeamsAllowed, PlayersRange &$playerPerTeamAllowed)
|
||||
protected function __construct($supportedOptions, TeamsRange $totalTeamsAllowed, PlayersRange $playerPerTeamAllowed)
|
||||
{
|
||||
$this->_supportedOptions = $supportedOptions;
|
||||
$this->_totalTeamsAllowed = $totalTeamsAllowed;
|
||||
|
@ -7,7 +7,7 @@ require_once(dirname(__FILE__) . '/RatingContainer.php');
|
||||
|
||||
class Team extends RatingContainer
|
||||
{
|
||||
public function __construct(Player &$player = null, Rating &$rating = null)
|
||||
public function __construct(Player &$player = null, Rating $rating = null)
|
||||
{
|
||||
parent::__construct();
|
||||
|
||||
@ -17,7 +17,7 @@ class Team extends RatingContainer
|
||||
}
|
||||
}
|
||||
|
||||
public function addPlayer(Player &$player, Rating &$rating)
|
||||
public function addPlayer(Player &$player, Rating $rating)
|
||||
{
|
||||
$this->setRating($player, $rating);
|
||||
return $this;
|
||||
|
@ -140,7 +140,7 @@ class TwoPlayerTrueSkillCalculator extends SkillCalculator
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public function calculateMatchQuality(GameInfo $gameInfo, array $teams)
|
||||
public function calculateMatchQuality(GameInfo &$gameInfo, array &$teams)
|
||||
{
|
||||
Guard::argumentNotNull($gameInfo, "gameInfo");
|
||||
$this->validateTeamCountAndPlayersCountPerTeam($teams);
|
||||
|
@ -47,7 +47,7 @@ class TwoTeamTrueSkillCalculator extends SkillCalculator
|
||||
parent::__construct(SkillCalculatorSupportedOptions::NONE, TeamsRange::exactly(2), PlayersRange::atLeast(1));
|
||||
}
|
||||
|
||||
public function calculateNewRatings(GameInfo $gameInfo,
|
||||
public function calculateNewRatings(GameInfo &$gameInfo,
|
||||
array $teams,
|
||||
array $teamRanks)
|
||||
{
|
||||
@ -146,7 +146,8 @@ class TwoTeamTrueSkillCalculator extends SkillCalculator
|
||||
$rankMultiplier = 1;
|
||||
}
|
||||
|
||||
foreach ($selfTeam->getAllPlayers() as &$selfTeamCurrentPlayer)
|
||||
$selfTeamAllPlayers = &$selfTeam->getAllPlayers();
|
||||
foreach ($selfTeamAllPlayers as &$selfTeamCurrentPlayer)
|
||||
{
|
||||
$localSelfTeamCurrentPlayer = &$selfTeamCurrentPlayer;
|
||||
$previousPlayerRating = $selfTeam->getRating($localSelfTeamCurrentPlayer);
|
||||
@ -165,7 +166,8 @@ class TwoTeamTrueSkillCalculator extends SkillCalculator
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public function calculateMatchQuality(GameInfo $gameInfo, array $teams)
|
||||
public function calculateMatchQuality(GameInfo &$gameInfo,
|
||||
array &$teams)
|
||||
{
|
||||
Guard::argumentNotNull($gameInfo, "gameInfo");
|
||||
$this->validateTeamCountAndPlayersCountPerTeam($teams);
|
||||
|
Reference in New Issue
Block a user