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

Another pass at fixing up references

Browse Source
This commit is contained in:
Jeff Moser
2010-09-30 08:25:31 -04:00
parent 5368f7528e
commit 803a0816a8
28 changed files with 168 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PHPSkills/Elo/FideEloCalculator.php
View File

@@ -5,7 +5,7 @@ namespace Moserware\Skills\Elo;
require_once(dirname(__FILE__) . "/TwoPlayerEloCalculator.php");
require_once(dirname(__FILE__) . "/FideKFactor.php");
/** Including ELO's scheme as a simple comparison.
/** Including Elo's scheme as a simple comparison.
* See http://en.wikipedia.org/wiki/Elo_rating_system#Theory
* for more details
*/

17
PHPSkills/FactorGraphs/Factor.php
View File

@@ -50,7 +50,7 @@ abstract class Factor
{
Guard::argumentIsValidIndex($messageIndex, count($this->_messages), "messageIndex");
$message = &$this->_messages[$messageIndex];
$variable = &$this->_messageToVariableBinding->getValue($this->_messages[$messageIndex]);
$variable = &$this->_messageToVariableBinding->getValue($message);
return $this->updateMessageVariable($message, $variable);
}
@@ -62,7 +62,8 @@ abstract class Factor
/// Resets the marginal of the variables a factor is connected to
public function resetMarginals()
{
foreach ($this->_messageToVariableBinding->getAllValues() as $currentVariable)
$allValues = &$this->_messageToVariableBinding->getAllValues();
foreach ($allValues as $currentVariable)
{
$currentVariable->resetToPrior();
}
@@ -73,21 +74,21 @@ abstract class Factor
{
Guard::argumentIsValidIndex($messageIndex, count($this->_messages), "messageIndex");
$message = $this->_messages[$messageIndex];
$variable = $this->_messageToVariableBinding->getValue($message);
$message = &$this->_messages[$messageIndex];
$variable = &$this->_messageToVariableBinding->getValue($message);
return $this->sendMessageVariable($message, $variable);
}
protected abstract function sendMessageVariable(Message &$message, Variable &$variable);
public abstract function createVariableToMessageBinding(Variable &$variable);
public abstract function &createVariableToMessageBinding(Variable &$variable);
protected function createVariableToMessageBindingWithMessage(Variable &$variable, Message &$message)
protected function &createVariableToMessageBindingWithMessage(Variable &$variable, Message &$message)
{
$index = count($this->_messages);
$this->_messages[] = $message;
$this->_messages[] = &$message;
$this->_messageToVariableBinding->setValue($message, $variable);
$this->_variables[] = $variable;
$this->_variables[] = &$variable;
return $message;
}

7
PHPSkills/FactorGraphs/FactorGraph.php
View File

@@ -1,16 +1,19 @@
<?php
namespace Moserware\Skills\FactorGraphs;
require_once(dirname(__FILE__) . "/VariableFactory.php");
class FactorGraph
{
private $_variableFactory;
public function &getVariableFactory()
{
return $this->_variableFactory;
$factory = &$this->_variableFactory;
return $factory;
}
public function setVariableFactory(&$factory)
public function setVariableFactory(VariableFactory &$factory)
{
$this->_variableFactory = &$factory;
}

17
PHPSkills/FactorGraphs/FactorGraphLayer.php
View File

@@ -1,6 +1,7 @@
<?php
namespace Moserware\Skills\FactorGraphs;
require_once(dirname(__FILE__) . "/Factor.php");
require_once(dirname(__FILE__) . "/FactorGraph.php");
require_once(dirname(__FILE__) . "/Schedule.php");
@@ -18,24 +19,28 @@ abstract class FactorGraphLayer
protected function &getInputVariablesGroups()
{
return $this->_inputVariablesGroups;
$inputVariablesGroups = &$this->_inputVariablesGroups;
return $inputVariablesGroups;
}
// HACK
public function &getParentFactorGraph()
{
return $this->_parentFactorGraph;
$parentFactorGraph = &$this->_parentFactorGraph;
return $parentFactorGraph;
}
public function &getOutputVariablesGroups()
{
return $this->_outputVariablesGroups;
$outputVariablesGroups = &$this->_outputVariablesGroups;
return $outputVariablesGroups;
}
public function &getLocalFactors()
{
return $this->_localFactors;
$localFactors = &$this->_localFactors;
return $localFactors;
}
public function setInputVariablesGroups(&$value)
@@ -43,12 +48,12 @@ abstract class FactorGraphLayer
$this->_inputVariablesGroups = $value;
}
protected function scheduleSequence($itemsToSequence, $name)
protected function scheduleSequence(array $itemsToSequence, $name)
{
return new ScheduleSequence($name, $itemsToSequence);
}
protected function addLayerFactor(&$factor)
protected function addLayerFactor(Factor &$factor)
{
$this->_localFactors[] = $factor;
}

7
PHPSkills/FactorGraphs/FactorList.php
View File

@@ -13,7 +13,8 @@ class FactorList
public function getLogNormalization()
{
foreach($this->_list as $currentFactor)
$list = &$this->_list;
foreach($list as &$currentFactor)
{
$currentFactor->resetMarginals();
}
@@ -36,7 +37,7 @@ class FactorList
$sumLogS = 0;
foreach($this->_list as $currentFactor)
foreach($list as &$currentFactor)
{
$sumLogS = $sumLogS + $currentFactor->getLogNormalization();
}
@@ -49,7 +50,7 @@ class FactorList
return count($this->_list);
}
public function addFactor(Factor &$factor)
public function &addFactor(Factor &$factor)
{
$this->_list[] = $factor;
return $factor;

5
PHPSkills/FactorGraphs/Message.php
View File

@@ -6,7 +6,7 @@ class Message
private $_name;
private $_value;
public function __construct($value = null, $name = null)
public function __construct(&$value = null, $name = null)
{
$this->_name = $name;
$this->_value = $value;
@@ -14,7 +14,8 @@ class Message
public function& getValue()
{
return $this->_value;
$value = &$this->_value;
return $value;
}
public function setValue(&$value)

11
PHPSkills/FactorGraphs/Schedule.php
View File

@@ -1,6 +1,8 @@
<?php
namespace Moserware\Skills\FactorGraphs;
require_once(dirname(__FILE__) . "/Factor.php");
abstract class Schedule
{
private $_name;
@@ -23,7 +25,7 @@ class ScheduleStep extends Schedule
private $_factor;
private $_index;
public function __construct($name, $factor, $index)
public function __construct($name, Factor &$factor, $index)
{
parent::__construct($name);
$this->_factor = $factor;
@@ -41,7 +43,7 @@ class ScheduleSequence extends Schedule
{
private $_schedules;
public function __construct($name, $schedules)
public function __construct($name, array $schedules)
{
parent::__construct($name);
$this->_schedules = $schedules;
@@ -51,7 +53,8 @@ class ScheduleSequence extends Schedule
{
$maxDelta = 0;
foreach ($this->_schedules as $currentSchedule)
$schedules = &$this->_schedules;
foreach ($schedules as &$currentSchedule)
{
$maxDelta = max($currentSchedule->visit($depth + 1, $maxDepth), $maxDelta);
}
@@ -65,7 +68,7 @@ class ScheduleLoop extends Schedule
private $_maxDelta;
private $_scheduleToLoop;
public function __construct($name, Schedule $scheduleToLoop, $maxDelta)
public function __construct($name, Schedule &$scheduleToLoop, $maxDelta)
{
parent::__construct($name);
$this->_scheduleToLoop = $scheduleToLoop;

11
PHPSkills/FactorGraphs/Variable.php
View File

@@ -7,7 +7,7 @@ class Variable
private $_prior;
private $_value;
public function __construct($name, $prior)
public function __construct($name, &$prior)
{
$this->_name = "Variable[" . $name . "]";
$this->_prior = $prior;
@@ -16,7 +16,8 @@ class Variable
public function &getValue()
{
return $this->_value;
$value = &$this->_value;
return $value;
}
public function setValue(&$value)
@@ -42,12 +43,12 @@ class DefaultVariable extends Variable
parent::__construct("Default", null);
}
public function getValue()
public function &getValue()
{
return null;
}
public function setValue($value)
public function setValue(&$value)
{
throw new Exception();
}
@@ -56,7 +57,7 @@ class DefaultVariable extends Variable
class KeyedVariable extends Variable
{
private $_key;
public function __construct($key, $name, $prior)
public function __construct($key, $name, &$prior)
{
parent::__construct($name, $prior);
$this->_key = $key;

4
PHPSkills/FactorGraphs/VariableFactory.php
View File

@@ -14,14 +14,14 @@ class VariableFactory
$this->_variablePriorInitializer = &$variablePriorInitializer;
}
public function createBasicVariable($name)
public function &createBasicVariable($name)
{
$initializer = $this->_variablePriorInitializer;
$newVar = new Variable($name, $initializer());
return $newVar;
}
public function createKeyedVariable($key, $name)
public function &createKeyedVariable(&$key, $name)
{
$initializer = $this->_variablePriorInitializer;
$newVar = new KeyedVariable($key, $name, $initializer());

5
PHPSkills/HashMap.php
View File

@@ -7,10 +7,11 @@ class HashMap
private $_hashToValue = array();
private $_hashToKey = array();
public function getValue($key)
public function &getValue($key)
{
$hash = self::getHash($key);
return $this->_hashToValue[$hash];
$hashValue = &$this->_hashToValue[$hash];
return $hashValue;
}
public function setValue($key, $value)

2
PHPSkills/Numerics/BasicMath.php
View File

@@ -15,7 +15,7 @@ function square($x)
return $x * $x;
}
function sum($itemsToSum, $funcName )
function sum(array $itemsToSum, $funcName )
{
$mappedItems = array_map($funcName, $itemsToSum);
return array_sum($mappedItems);

21
PHPSkills/Numerics/GaussianDistribution.php
View File

@@ -30,8 +30,25 @@ class GaussianDistribution
$this->_mean = $mean;
$this->_standardDeviation = $standardDeviation;
$this->_variance = square($standardDeviation);
$this->_precision = 1.0/$this->_variance;
$this->_precisionMean = $this->_precision*$this->_mean;
if($this->_variance != 0)
{
$this->_precision = 1.0/$this->_variance;
$this->_precisionMean = $this->_precision*$this->_mean;
}
else
{
$this->_precision = \INF;
if($this->_mean == 0)
{
$this->_precisionMean = 0;
}
else
{
$this->_precisionMean = \INF;
}
}
}
public function getMean()

3
PHPSkills/Player.php
View File

@@ -38,8 +38,9 @@ class Player implements ISupportPartialPlay, ISupportPartialUpdate
/// <summary>
/// The identifier for the player, such as a name.
/// </summary>
public function getId()
public function &getId()
{
$id = &$this->_Id;
return $this->_Id;
}

5
PHPSkills/RatingContainer.php
View File

@@ -12,9 +12,10 @@ class RatingContainer
$this->_playerToRating = new HashMap();
}
public function getRating($player)
public function &getRating($player)
{
return $this->_playerToRating->getValue($player);
$rating = &$this->_playerToRating->getValue($player);
return $rating;
}
public function setRating($player, $rating)

4
PHPSkills/Team.php
View File

@@ -5,7 +5,7 @@ require_once(dirname(__FILE__) . '/RatingContainer.php');
class Team extends RatingContainer
{
public function __construct($player = null, $rating = null)
public function __construct(&$player = null, &$rating = null)
{
parent::__construct();
@@ -15,7 +15,7 @@ class Team extends RatingContainer
}
}
public function addPlayer($player, $rating)
public function addPlayer(&$player, &$rating)
{
$this->setRating($player, $rating);
return $this;

2
PHPSkills/Teams.php
View File

@@ -8,7 +8,7 @@ class Teams
$args = \func_get_args();
$result = array();
foreach ($args as $currentTeam) {
foreach ($args as &$currentTeam) {
$result[] = $currentTeam;
}

5
PHPSkills/TrueSkill/Factors/GaussianFactor.php
View File

@@ -29,12 +29,13 @@ abstract class GaussianFactor extends Factor
return $logZ;
}
public function createVariableToMessageBinding(Variable &$variable)
public function &createVariableToMessageBinding(Variable &$variable)
{
return parent::createVariableToMessageBindingWithMessage($variable,
$binding = &parent::createVariableToMessageBindingWithMessage($variable,
new Message(
GaussianDistribution::fromPrecisionMean(0, 0),
sprintf("message from %s to %s", $this, $variable)));
return $binding;
}
}

4
PHPSkills/TrueSkill/Factors/GaussianLikelihoodFactor.php
View File

@@ -28,8 +28,8 @@ class GaussianLikelihoodFactor extends GaussianFactor
public function getLogNormalization()
{
$vars = $this->getVariables();
$messages = $this->getMessages();
$vars = &$this->getVariables();
$messages = &$this->getMessages();
return GaussianDistribution::logRatioNormalization(
$vars[0]->getValue(),

2
PHPSkills/TrueSkill/Factors/GaussianWeightedSumFactor.php
View File

@@ -118,7 +118,7 @@ class GaussianWeightedSumFactor extends GaussianFactor
$this->createVariableToMessageBinding($sumVariable);
foreach ($variablesToSum as $currentVariable)
foreach ($variablesToSum as &$currentVariable)
{
$this->createVariableToMessageBinding($currentVariable);
}

32
PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
View File

@@ -33,8 +33,8 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->setInputVariablesGroups($inputVariablesGroups);
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->buildLayer();
$this->_TeamDifferencesComparisonLayer->setInputVariablesGroups(
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getOutputVariablesGroups());
$teamDifferencesOutputVariablesGroups = &$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getOutputVariablesGroups();
$this->_TeamDifferencesComparisonLayer->setInputVariablesGroups($teamDifferencesOutputVariablesGroups);
$this->_TeamDifferencesComparisonLayer->buildLayer();
}
@@ -65,10 +65,10 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
$loop,
new ScheduleStep(
"teamPerformanceToPerformanceDifferenceFactors[0] @ 1",
$localFactors[0], 1),
&$localFactors[0], 1),
new ScheduleStep(
sprintf("teamPerformanceToPerformanceDifferenceFactors[teamTeamDifferences = %d - 1] @ 2", $totalTeamDifferences),
$localFactors[$totalTeamDifferences - 1], 2)
&$localFactors[$totalTeamDifferences - 1], 2)
)
);
@@ -83,11 +83,11 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
$itemsToSequence = array(
new ScheduleStep(
"send team perf to perf differences",
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[0],
&$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[0],
0),
new ScheduleStep(
"send to greater than or within factor",
$teamDifferencesComparisonLayerLocalFactors[0],
&$teamDifferencesComparisonLayerLocalFactors[0],
0)
);
@@ -112,16 +112,16 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
array(
new ScheduleStep(
sprintf("team perf to perf diff %d", $i),
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$i], 0),
&$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$i], 0),
new ScheduleStep(
sprintf("greater than or within result factor %d", $i),
$teamDifferencesComparisonLayerLocalFactors[$i], 0),
&$teamDifferencesComparisonLayerLocalFactors[$i], 0),
new ScheduleStep(
sprintf("team perf to perf diff factors [%d], 2", $i),
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$i], 2)
&$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$i], 2)
), sprintf("current forward schedule piece %d", $i));
$forwardScheduleList[] = &$currentForwardSchedulePiece;
$forwardScheduleList[] = $currentForwardSchedulePiece;
}
$forwardSchedule = new ScheduleSequence("forward schedule", $forwardScheduleList);
@@ -133,20 +133,24 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors = &$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getLocalFactors();
$teamDifferencesComparisonLayerLocalFactors = &$this->_TeamDifferencesComparisonLayer->getLocalFactors();
$differencesFactor = &$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$totalTeamDifferences - 1 - $i];
$comparisonFactor = &$teamDifferencesComparisonLayerLocalFactors[$totalTeamDifferences - 1 - $i];
$performancesToDifferencesFactor = &$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$totalTeamDifferences - 1 - $i];
$currentBackwardSchedulePiece = new ScheduleSequence(
"current backward schedule piece",
array(
new ScheduleStep(
sprintf("teamPerformanceToPerformanceDifferenceFactors[totalTeamDifferences - 1 - %d] @ 0", $i),
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$totalTeamDifferences - 1 - $i], 0),
$differencesFactor, 0),
new ScheduleStep(
sprintf("greaterThanOrWithinResultFactors[totalTeamDifferences - 1 - %d] @ 0", $i),
$teamDifferencesComparisonLayerLocalFactors[$totalTeamDifferences - 1 - $i], 0),
$comparisonFactor, 0),
new ScheduleStep(
sprintf("teamPerformanceToPerformanceDifferenceFactors[totalTeamDifferences - 1 - %d] @ 1", $i),
$teamPerformancesToTeamPerformanceDifferencesLayerLocalFactors[$totalTeamDifferences - 1 - $i], 1)
$performancesToDifferencesFactor, 1)
));
$backwardScheduleList[] = &$currentBackwardSchedulePiece;
$backwardScheduleList[] = $currentBackwardSchedulePiece;
}
$backwardSchedule = new ScheduleSequence("backward schedule", $backwardScheduleList);

22
PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
View File

@@ -39,14 +39,17 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye
public function createPriorSchedule()
{
return $this->scheduleSequence(
array_map(
function($weightedSumFactor)
{
return new ScheduleStep("Perf to Team Perf Step", $weightedSumFactor, 0);
},
$this->getLocalFactors()),
"all player perf to team perf schedule");
$localFactors = &$this->getLocalFactors();
$sequence = &$this->scheduleSequence(
array_map(
function($weightedSumFactor)
{
return new ScheduleStep("Perf to Team Perf Step", $weightedSumFactor, 0);
},
$localFactors),
"all player perf to team perf schedule");
return $sequence;
}
protected function createPlayerToTeamSumFactor(&$teamMembers, &$sumVariable)
@@ -69,7 +72,8 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye
{
// BLOG
$allFactors = array();
foreach($this->getLocalFactors() as $currentFactor)
$localFactors = &$this->getLocalFactors();
foreach($localFactors as &$currentFactor)
{
$numberOfMessages = $currentFactor->getNumberOfMessages();
for($currentIteration = 1; $currentIteration < $numberOfMessages; $currentIteration++)

22
PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
View File

@@ -1,15 +1,20 @@
<?php
namespace Moserware\Skills\TrueSkill\Layers;
require_once(dirname(__FILE__) . "/../../Rating.php");
require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
require_once(dirname(__FILE__) . "/../../Numerics/BasicMath.php");
require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
require_once(dirname(__FILE__) . "/../Factors/GaussianPriorFactor.php");
require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
use Moserware\Skills\Rating;
use Moserware\Skills\FactorGraphs\ScheduleLoop;
use Moserware\Skills\FactorGraphs\ScheduleSequence;
use Moserware\Skills\FactorGraphs\ScheduleStep;
use Moserware\Skills\FactorGraphs\Variable;
use Moserware\Numerics\GaussianDistribution;
use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
use Moserware\Skills\TrueSkill\Factors\GaussianPriorFactor;
@@ -27,11 +32,13 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
public function buildLayer()
{
foreach ($this->_teams as $currentTeam)
$teams = &$this->_teams;
foreach ($teams as &$currentTeam)
{
$currentTeamSkills = array();
foreach ($currentTeam->getAllPlayers() as $currentTeamPlayer)
$currentTeamAllPlayers = &$currentTeam->getAllPlayers();
foreach ($currentTeamAllPlayers as &$currentTeamPlayer)
{
$currentTeamPlayerRating = $currentTeam->getRating($currentTeamPlayer);
$playerSkill = $this->createSkillOutputVariable($currentTeamPlayer);
@@ -47,17 +54,18 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
public function createPriorSchedule()
{
$localFactors = &$this->getLocalFactors();
return $this->scheduleSequence(
array_map(
function($prior)
function(&$prior)
{
return new ScheduleStep("Prior to Skill Step", $prior, 0);
},
$this->getLocalFactors()),
$localFactors),
"All priors");
}
private function createPriorFactor(&$player, &$priorRating, &$skillsVariable)
private function createPriorFactor(&$player, Rating &$priorRating, Variable &$skillsVariable)
{
return new GaussianPriorFactor($priorRating->getMean(),
square($priorRating->getStandardDeviation()) +
@@ -67,8 +75,8 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
private function createSkillOutputVariable($key)
{
$parentFactorGraph = $this->getParentFactorGraph();
$variableFactory = $parentFactorGraph->getVariableFactory();
$parentFactorGraph = &$this->getParentFactorGraph();
$variableFactory = &$parentFactorGraph->getVariableFactory();
return $variableFactory->createKeyedVariable($key, $key . "'s skill");
}
}

18
PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
View File

@@ -2,12 +2,14 @@
namespace Moserware\Skills\TrueSkill\Layers;
require_once(dirname(__FILE__) . "/../../FactorGraphs/Schedule.php");
require_once(dirname(__FILE__) . "/../../FactorGraphs/Variable.php");
require_once(dirname(__FILE__) . "/../../Numerics/BasicMath.php");
require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
require_once(dirname(__FILE__) . "/../Factors/GaussianLikelihoodFactor.php");
require_once(dirname(__FILE__) . "/TrueSkillFactorGraphLayer.php");
use Moserware\Skills\FactorGraphs\ScheduleStep;
use Moserware\Skills\FactorGraphs\KeyedVariable;
use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
use Moserware\Skills\TrueSkill\Factors\GaussianLikelihoodFactor;
@@ -20,7 +22,10 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
public function buildLayer()
{
foreach ($this->getInputVariablesGroups() as $currentTeam)
$inputVariablesGroups = &$this->getInputVariablesGroups();
$outputVariablesGroups = &$this->getOutputVariablesGroups();
foreach ($inputVariablesGroups as &$currentTeam)
{
$currentTeamPlayerPerformances = array();
@@ -30,14 +35,13 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
$newLikelihoodFactor = $this->createLikelihood($playerSkillVariable, $playerPerformance);
$this->addLayerFactor($newLikelihoodFactor);
$currentTeamPlayerPerformances[] = $playerPerformance;
}
}
$outputVariablesGroups = &$this->getOutputVariablesGroups();
$outputVariablesGroups[] = $currentTeamPlayerPerformances;
}
}
private function createLikelihood(&$playerSkill, &$playerPerformance)
private function createLikelihood(KeyedVariable &$playerSkill, KeyedVariable &$playerPerformance)
{
return new GaussianLikelihoodFactor(square($this->getParentFactorGraph()->getGameInfo()->getBeta()), $playerPerformance, $playerSkill);
}
@@ -49,25 +53,27 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
public function createPriorSchedule()
{
$localFactors = &$this->getLocalFactors();
return $this->scheduleSequence(
array_map(
function($likelihood)
{
return new ScheduleStep("Skill to Perf step", $likelihood, 0);
},
$this->getLocalFactors()),
$localFactors),
"All skill to performance sending");
}
public function createPosteriorSchedule()
{
$localFactors = &$this->getLocalFactors();
return $this->scheduleSequence(
array_map(
function($likelihood)
{
return new ScheduleStep("name", $likelihood, 1);
},
$this->getLocalFactors()),
$localFactors),
"All skill to performance sending");
}
}

4
PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
View File

@@ -21,7 +21,7 @@ class TeamDifferencesComparisonLayer extends TrueSkillFactorGraphLayer
{
parent::__construct($parentGraph);
$this->_teamRanks = $teamRanks;
$gameInfo = $this->getParentFactorGraph()->getGameInfo();
$gameInfo = &$this->getParentFactorGraph()->getGameInfo();
$this->_epsilon = DrawMargin::getDrawMarginFromDrawProbability($gameInfo->getDrawProbability(), $gameInfo->getBeta());
}
@@ -33,7 +33,7 @@ class TeamDifferencesComparisonLayer extends TrueSkillFactorGraphLayer
for ($i = 0; $i < $inputVarGroupsCount; $i++)
{
$isDraw = ($this->_teamRanks[$i] == $this->_teamRanks[$i + 1]);
$teamDifference = $inputVarGroups[$i][0];
$teamDifference = &$inputVarGroups[$i][0];
$factor =
$isDraw

8
PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
View File

@@ -22,18 +22,18 @@ class TeamPerformancesToTeamPerformanceDifferencesLayer extends TrueSkillFactorG
{
$inputVariablesGroups = &$this->getInputVariablesGroups();
$inputVariablesGroupsCount = count($inputVariablesGroups);
$outputVariablesGroup = &$this->getOutputVariablesGroups();
for ($i = 0; $i < $inputVariablesGroupsCount - 1; $i++)
{
$strongerTeam = $inputVariablesGroups[$i][0];
$weakerTeam = $inputVariablesGroups[$i + 1][0];
$strongerTeam = &$inputVariablesGroups[$i][0];
$weakerTeam = &$inputVariablesGroups[$i + 1][0];
$currentDifference = &$this->createOutputVariable();
$newDifferencesFactor = $this->createTeamPerformanceToDifferenceFactor($strongerTeam, $weakerTeam, $currentDifference);
$this->addLayerFactor($newDifferencesFactor);
// REVIEW: Does it make sense to have groups of one?
$outputVariablesGroup = &$this->getOutputVariablesGroups();
// REVIEW: Does it make sense to have groups of one?
$outputVariablesGroup[] = array($currentDifference);
}
}

19
PHPSkills/TrueSkill/TrueSkillFactorGraph.php
View File

@@ -68,7 +68,8 @@ class TrueSkillFactorGraph extends FactorGraph
{
$lastOutput = null;
foreach ($this->_layers as $currentLayer)
$layers = &$this->_layers;
foreach ($layers as &$currentLayer)
{
if ($lastOutput != null)
{
@@ -91,9 +92,11 @@ class TrueSkillFactorGraph extends FactorGraph
{
$factorList = new FactorList();
foreach ($this->_layers as $currentLayer)
$layers = &$this->_layers;
foreach ($layers as &$currentLayer)
{
foreach ($currentLayer->getLocalFactors() as $currentFactor)
$localFactors = &$currentLayer->getLocalFactors();
foreach ($localFactors as &$currentFactor)
{
$factorList->addFactor($currentFactor);
}
@@ -107,7 +110,8 @@ class TrueSkillFactorGraph extends FactorGraph
{
$fullSchedule = array();
foreach ($this->_layers as $currentLayer)
$layers = &$this->_layers;
foreach ($layers as &$currentLayer)
{
$currentPriorSchedule = $currentLayer->createPriorSchedule();
if ($currentPriorSchedule != null)
@@ -118,7 +122,7 @@ class TrueSkillFactorGraph extends FactorGraph
$allLayersReverse = \array_reverse($this->_layers);
foreach ($allLayersReverse as $currentLayer)
foreach ($allLayersReverse as &$currentLayer)
{
$currentPosteriorSchedule = $currentLayer->createPosteriorSchedule();
if ($currentPosteriorSchedule != null)
@@ -134,9 +138,10 @@ class TrueSkillFactorGraph extends FactorGraph
{
$result = new RatingContainer();
foreach ($this->_priorLayer->getOutputVariablesGroups() as $currentTeam)
$priorLayerOutputVariablesGroups = &$this->_priorLayer->getOutputVariablesGroups();
foreach ($priorLayerOutputVariablesGroups as &$currentTeam)
{
foreach ($currentTeam as $currentPlayer)
foreach ($currentTeam as &$currentPlayer)
{
$newRating = new Rating($currentPlayer->getValue()->getMean(),
$currentPlayer->getValue()->getStandardDeviation());

8
PHPSkills/TrueSkill/TwoPlayerTrueSkillCalculator.php
View File

@@ -2,6 +2,7 @@
namespace Moserware\Skills\TrueSkill;
require_once(dirname(__FILE__) . "/../GameInfo.php");
require_once(dirname(__FILE__) . "/../Guard.php");
require_once(dirname(__FILE__) . "/../PairwiseComparison.php");
require_once(dirname(__FILE__) . "/../RankSorter.php");
@@ -17,6 +18,7 @@ require_once(dirname(__FILE__) . "/../Numerics/BasicMath.php");
require_once(dirname(__FILE__) . "/DrawMargin.php");
require_once(dirname(__FILE__) . "/TruncatedGaussianCorrectionFunctions.php");
use Moserware\Skills\GameInfo;
use Moserware\Skills\Guard;
use Moserware\Skills\PairwiseComparison;
use Moserware\Skills\RankSorter;
@@ -42,7 +44,7 @@ class TwoPlayerTrueSkillCalculator extends SkillCalculator
parent::__construct(SkillCalculatorSupportedOptions::NONE, TeamsRange::exactly(2), PlayersRange::exactly(1));
}
public function calculateNewRatings($gameInfo,
public function calculateNewRatings(GameInfo &$gameInfo,
array $teams,
array $teamRanks)
{
@@ -82,7 +84,7 @@ class TwoPlayerTrueSkillCalculator extends SkillCalculator
return $results;
}
private static function calculateNewRating($gameInfo, $selfRating, $opponentRating, $comparison)
private static function calculateNewRating(GameInfo $gameInfo, Rating $selfRating, Rating $opponentRating, $comparison)
{
$drawMargin = DrawMargin::getDrawMarginFromDrawProbability($gameInfo->getDrawProbability(),
$gameInfo->getBeta());
@@ -138,7 +140,7 @@ class TwoPlayerTrueSkillCalculator extends SkillCalculator
}
/// <inheritdoc/>
public function calculateMatchQuality($gameInfo, array $teams)
public function calculateMatchQuality(GameInfo $gameInfo, array $teams)
{
Guard::argumentNotNull($gameInfo, "gameInfo");
$this->validateTeamCountAndPlayersCountPerTeam($teams);

4
PHPSkills/TrueSkill/TwoTeamTrueSkillCalculator.php
View File

@@ -47,7 +47,7 @@ class TwoTeamTrueSkillCalculator extends SkillCalculator
parent::__construct(SkillCalculatorSupportedOptions::NONE, TeamsRange::exactly(2), PlayersRange::atLeast(1));
}
public function calculateNewRatings($gameInfo,
public function calculateNewRatings(GameInfo $gameInfo,
array $teams,
array $teamRanks)
{
@@ -164,7 +164,7 @@ class TwoTeamTrueSkillCalculator extends SkillCalculator
}
/// <inheritdoc/>
public function calculateMatchQuality($gameInfo, array $teams)
public function calculateMatchQuality(GameInfo $gameInfo, array $teams)
{
Guard::argumentNotNull($gameInfo, "gameInfo");
$this->validateTeamCountAndPlayersCountPerTeam($teams);