jct/trueskill
1
0
Fork 0
mirror of https://github.com/furyfire/trueskill.git synced 2024-09-19 23:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an array size issue because of ignored 0 value

Browse Source
This commit is contained in:
Jeff Moser 2010-10-02 14:17:48 -04:00
parent 803a0816a8
commit c22683ab33
7 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PHPSkills/FactorGraphs/Factor.php
View File

@ -63,7 +63,7 @@ abstract class Factor
public function resetMarginals()
{
$allValues = &$this->_messageToVariableBinding->getAllValues();
foreach ($allValues as $currentVariable)
foreach ($allValues as &$currentVariable)
{
$currentVariable->resetToPrior();
}

3
PHPSkills/FactorGraphs/Schedule.php
View File

@ -56,7 +56,8 @@ class ScheduleSequence extends Schedule
$schedules = &$this->_schedules;
foreach ($schedules as &$currentSchedule)
{
$maxDelta = max($currentSchedule->visit($depth + 1, $maxDepth), $maxDelta);
$currentVisit = $currentSchedule->visit($depth + 1, $maxDepth);
$maxDelta = max($currentVisit, $maxDelta);
}
return $maxDelta;

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

@ -34,10 +34,9 @@ class GaussianWeightedSumFactor extends GaussianFactor
// The first weights are a straightforward copy
// v_0 = a_1*v_1 + a_2*v_2 + ... + a_n * v_n
$this->_weights[0] = array();
$variableWeightsLength = count($variableWeights);
$this->_weights[0] = \array_fill(0, count($variableWeights), 0);
for($i = 0; $i < $variableWeightsLength; $i++)
{
$weight = &$variableWeights[$i];
@ -53,7 +52,9 @@ class GaussianWeightedSumFactor extends GaussianFactor
{
$this->_variableIndexOrdersForWeights[0][] = $i;
}
$variableWeightsLength = count($variableWeights);
// The rest move the variables around and divide out the constant.
// For example:
// v_1 = (-a_2 / a_1) * v_2 + (-a3/a1) * v_3 + ... + (1.0 / a_1) * v_0
@ -61,19 +62,17 @@ class GaussianWeightedSumFactor extends GaussianFactor
$weightsLength = $variableWeightsLength + 1;
for ($weightsIndex = 1; $weightsIndex < $weightsLength; $weightsIndex++)
{
$currentWeights = array();
{
$currentWeights = \array_fill(0, $variableWeightsLength, 0);
$variableIndices = array();
$variableIndices = \array_fill(0, $variableWeightsLength + 1, 0);
$variableIndices[0] = $weightsIndex;
$currentWeightsSquared = array();
$currentWeightsSquared = \array_fill(0, $variableWeightsLength, 0);
// keep a single variable to keep track of where we are in the array.
// This is helpful since we skip over one of the spots
$currentDestinationWeightIndex = 0;
$variableWeightsLength = count($variableWeights);
$currentDestinationWeightIndex = 0;
for ($currentWeightSourceIndex = 0;
$currentWeightSourceIndex < $variableWeightsLength;

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

@ -59,16 +59,19 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
$totalTeams = $totalTeamDifferences + 1;
$localFactors = &$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getLocalFactors();
$firstDifferencesFactor = &$localFactors[0];
$lastDifferencesFactor = &$localFactors[$totalTeamDifferences - 1];
$innerSchedule = new ScheduleSequence(
"inner schedule",
array(
$loop,
new ScheduleStep(
"teamPerformanceToPerformanceDifferenceFactors[0] @ 1",
&$localFactors[0], 1),
$firstDifferencesFactor, 1),
new ScheduleStep(
sprintf("teamPerformanceToPerformanceDifferenceFactors[teamTeamDifferences = %d - 1] @ 2", $totalTeamDifferences),
&$localFactors[$totalTeamDifferences - 1], 2)
$lastDifferencesFactor, 2)
)
);

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

@ -25,9 +25,10 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye
public function buildLayer()
{
foreach ($this->getInputVariablesGroups() as $currentTeam)
$inputVariablesGroups = &$this->getInputVariablesGroups();
foreach ($inputVariablesGroups as &$currentTeam)
{
$teamPerformance = $this->createOutputVariable($currentTeam);
$teamPerformance = &$this->createOutputVariable($currentTeam);
$newSumFactor = $this->createPlayerToTeamSumFactor($currentTeam, $teamPerformance);
$this->addLayerFactor($newSumFactor);

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

@ -29,9 +29,10 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
{
$currentTeamPlayerPerformances = array();
foreach ($currentTeam as $playerSkillVariable)
foreach ($currentTeam as &$playerSkillVariable)
{
$playerPerformance = $this->createOutputVariable($playerSkillVariable->getKey());
$currentPlayer = &$playerSkillVariable->getKey();
$playerPerformance = $this->createOutputVariable($currentPlayer);
$newLikelihoodFactor = $this->createLikelihood($playerSkillVariable, $playerPerformance);
$this->addLayerFactor($newLikelihoodFactor);
$currentTeamPlayerPerformances[] = $playerPerformance;

2
PHPSkills/TrueSkill/TrueSkillFactorGraph.php
View File

@ -78,7 +78,7 @@ class TrueSkillFactorGraph extends FactorGraph
$currentLayer->buildLayer();
$lastOutput = &$currentLayer->getOutputVariablesGroups();
$lastOutput = &$currentLayer->getOutputVariablesGroups();
}
}