diff --git a/src/Player.php b/src/Player.php index fcb7d6c..668b395 100644 --- a/src/Player.php +++ b/src/Player.php @@ -7,7 +7,7 @@ namespace DNW\Skills; /** * Represents a player who has a Rating. */ -class Player implements ISupportPartialPlay, ISupportPartialUpdate, \Stringable +class Player implements ISupportPartialPlay, ISupportPartialUpdate { private const DEFAULT_PARTIAL_PLAY_PERCENTAGE = 1.0; // = 100% play time @@ -20,7 +20,7 @@ class Player implements ISupportPartialPlay, ISupportPartialUpdate, \Stringable /** * Constructs a player. * - * @param mixed $Id The identifier for the player, such as a name. + * @param mixed $Id The identifier for the player, such as a name. * @param float $partialPlayPercentage The weight percentage to give this player when calculating a new rank. * @param float $partialUpdatePercentage Indicated how much of a skill update a player should receive where 0 represents no update and 1.0 represents 100% of the update. */ @@ -59,9 +59,9 @@ class Player implements ISupportPartialPlay, ISupportPartialUpdate, \Stringable { return $this->PartialUpdatePercentage; } - +/* public function __toString(): string { return (string)$this->Id; - } + }*/ } diff --git a/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php index 0ed6f33..a14e01a 100644 --- a/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php +++ b/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php @@ -7,8 +7,6 @@ namespace DNW\Skills\TrueSkill\Layers; use DNW\Skills\FactorGraphs\ScheduleStep; use DNW\Skills\FactorGraphs\ScheduleSequence; use DNW\Skills\PartialPlay; -use DNW\Skills\Player; -use DNW\Skills\Team; use DNW\Skills\TrueSkill\Factors\GaussianWeightedSumFactor; use DNW\Skills\FactorGraphs\Variable; use DNW\Skills\FactorGraphs\KeyedVariable; @@ -91,7 +89,7 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye */ private function createOutputVariable(array $team): Variable { - $memberNames = array_map(static fn($currentPlayer): string => (string)($currentPlayer->getKey()), $team); + $memberNames = array_map(static fn($currentPlayer): string => (string)($currentPlayer->getKey()->getId()), $team); $teamMemberNames = \implode(', ', $memberNames); diff --git a/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php b/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php index 68888a4..9c0a657 100644 --- a/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php +++ b/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php @@ -77,6 +77,6 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer $parentFactorGraph = $this->getParentFactorGraph(); $variableFactory = $parentFactorGraph->getVariableFactory(); - return $variableFactory->createKeyedVariable($key, $key . "'s skill"); + return $variableFactory->createKeyedVariable($key, (string)$key->getId() . "'s skill"); } } diff --git a/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php b/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php index 2da4e09..d7c5363 100644 --- a/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php +++ b/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php @@ -48,7 +48,7 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer private function createOutputVariable(mixed $key): KeyedVariable { - return $this->getParentFactorGraph()->getVariableFactory()->createKeyedVariable($key, $key . "'s performance"); + return $this->getParentFactorGraph()->getVariableFactory()->createKeyedVariable($key, (string)$key->getId() . "'s performance"); } public function createPriorSchedule(): ?ScheduleSequence diff --git a/tests/PlayerTest.php b/tests/PlayerTest.php index 675523a..0602a4e 100644 --- a/tests/PlayerTest.php +++ b/tests/PlayerTest.php @@ -12,7 +12,6 @@ class PlayerTest extends TestCase public function testPlayerObjectGetterSetter(): void { $p = new Player('dummy', 0.1, 0.2); - $this->assertEquals('dummy', (string)$p); $this->assertEquals('dummy', $p->getId()); $this->assertEquals(0.1, $p->getPartialPlayPercentage()); $this->assertEquals(0.2, $p->getPartialUpdatePercentage());