diff --git a/src/FactorGraphs/Factor.php b/src/FactorGraphs/Factor.php index ad15957..602e461 100644 --- a/src/FactorGraphs/Factor.php +++ b/src/FactorGraphs/Factor.php @@ -77,7 +77,7 @@ abstract class Factor protected function updateMessageVariable(Message $message, Variable $variable): float { - throw new Exception(); + throw new Exception("Must override updateMessageVariable(" . $message::class . ", " . $variable::class . ")"); } /** diff --git a/src/FactorGraphs/FactorGraphLayer.php b/src/FactorGraphs/FactorGraphLayer.php index 184b6bd..cbde722 100644 --- a/src/FactorGraphs/FactorGraphLayer.php +++ b/src/FactorGraphs/FactorGraphLayer.php @@ -70,7 +70,7 @@ abstract class FactorGraphLayer /** * @param Schedule[] $itemsToSequence */ - protected function scheduleSequence(array $itemsToSequence, string $name): ScheduleSequence + protected function scheduleSequence(array $itemsToSequence): ScheduleSequence { return new ScheduleSequence($itemsToSequence); } diff --git a/src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php b/src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php index d1a55d4..1a7092f 100644 --- a/src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php +++ b/src/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php @@ -101,9 +101,9 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer ), ]; + //loop of just two teams inner sequence return $this->scheduleSequence( - $itemsToSequence, - 'loop of just two teams inner sequence' + $itemsToSequence ); } @@ -120,10 +120,11 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer $currentTeamPerfToTeamPerfDiff = $teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$i]; $currentTeamDiffComparison = $teamDifferencesComparisonLayerLocalFactors[$i]; + //current forward schedule piece $i $currentForwardSchedulePiece = $this->scheduleSequence( [ - //team perf to perf diff + //team perf to perf diff new ScheduleStep( $currentTeamPerfToTeamPerfDiff, 0 @@ -138,8 +139,7 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer $currentTeamPerfToTeamPerfDiff, 2 ), - ], - sprintf('current forward schedule piece %d', $i) + ] ); $forwardScheduleList[] = $currentForwardSchedulePiece; diff --git a/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php index ea69c57..d1891e5 100644 --- a/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php +++ b/src/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php @@ -36,13 +36,13 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye { $localFactors = $this->getLocalFactors(); + //all player perf to team perf schedule return $this->scheduleSequence( array_map( //Perf to Team Perf Step static fn($weightedSumFactor): ScheduleStep => new ScheduleStep($weightedSumFactor, 0), $localFactors - ), - 'all player perf to team perf schedule' + ) ); } @@ -82,7 +82,8 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye } } - return $this->scheduleSequence($allFactors, "all of the team's sum iterations"); + //all of the team's sum iterations + return $this->scheduleSequence($allFactors); } /** diff --git a/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php b/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php index 72c9078..c1a3335 100644 --- a/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php +++ b/src/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php @@ -53,13 +53,13 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer { $localFactors = $this->getLocalFactors(); + //All priors return $this->scheduleSequence( array_map( //Prior to Skill Step static fn($prior): ScheduleStep => new ScheduleStep($prior, 0), $localFactors - ), - 'All priors' + ) ); } diff --git a/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php b/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php index b2c0592..7782200 100644 --- a/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php +++ b/src/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php @@ -55,13 +55,13 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer { $localFactors = $this->getLocalFactors(); + //All skill to performance sending return $this->scheduleSequence( array_map( //Skill to Perf step static fn($likelihood): ScheduleStep => new ScheduleStep($likelihood, 0), $localFactors - ), - 'All skill to performance sending' + ) ); } @@ -69,12 +69,12 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer { $localFactors = $this->getLocalFactors(); + //All skill to performance sending return $this->scheduleSequence( array_map( static fn($likelihood): ScheduleStep => new ScheduleStep($likelihood, 1), $localFactors - ), - 'All skill to performance sending' + ) ); } }