First pass at building the graph, but still off from running it

This commit is contained in:
Jeff Moser 2010-09-25 22:16:47 -04:00
parent eee44c9746
commit 8e9e2d0d86
5 changed files with 18 additions and 12 deletions

@ -93,7 +93,7 @@ class GaussianWeightedSumFactor extends GaussianFactor
} }
$currentWeights[$currentDestinationWeightIndex] = $currentWeight; $currentWeights[$currentDestinationWeightIndex] = $currentWeight;
$currentWeightsSquared[$currentDestinationWeightIndex] = $currentWeight*currentWeight; $currentWeightsSquared[$currentDestinationWeightIndex] = $currentWeight*$currentWeight;
$variableIndices[$currentDestinationWeightIndex + 1] = $currentWeightSourceIndex + 1; $variableIndices[$currentDestinationWeightIndex + 1] = $currentWeightSourceIndex + 1;
$currentDestinationWeightIndex++; $currentDestinationWeightIndex++;

@ -29,7 +29,8 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
public function buildLayer() public function buildLayer()
{ {
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->setInputVariablesGroups($this->getInputVariablesGroups()); $inputVariablesGroups = $this->getInputVariablesGroups();
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->setInputVariablesGroups($inputVariablesGroups);
$this->_TeamPerformancesToTeamPerformanceDifferencesLayer->buildLayer(); $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->buildLayer();
$this->_TeamDifferencesComparisonLayer->setInputVariablesGroups( $this->_TeamDifferencesComparisonLayer->setInputVariablesGroups(

@ -27,12 +27,13 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye
{ {
foreach ($this->getInputVariablesGroups() as $currentTeam) foreach ($this->getInputVariablesGroups() as $currentTeam)
{ {
$teamPerformance = $this->createOutputVariable($currentTeam); $teamPerformance = &$this->createOutputVariable($currentTeam);
$this->addLayerFactor($this->createPlayerToTeamSumFactor($currentTeam, $teamPerformance)); $newSumFactor = $this->createPlayerToTeamSumFactor($currentTeam, $teamPerformance);
$this->addLayerFactor($newSumFactor);
// REVIEW: Does it make sense to have groups of one? // REVIEW: Does it make sense to have groups of one?
$outputVariablesGroups = $this->getOutputVariablesGroups(); $outputVariablesGroups = &$this->getOutputVariablesGroups();
$outputVariablesGroups = $teamPerformance; $outputVariablesGroups[] = array($teamPerformance);
} }
} }

@ -27,7 +27,8 @@ class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
foreach ($currentTeam as $playerSkillVariable) foreach ($currentTeam as $playerSkillVariable)
{ {
$playerPerformance = $this->createOutputVariable($playerSkillVariable->getKey()); $playerPerformance = $this->createOutputVariable($playerSkillVariable->getKey());
$this->addLayerFactor($this->createLikelihood($playerSkillVariable, $playerPerformance)); $newLikelihoodFactor = $this->createLikelihood($playerSkillVariable, $playerPerformance);
$this->addLayerFactor($newLikelihoodFactor);
$currentTeamPlayerPerformances[] = &$playerPerformance; $currentTeamPlayerPerformances[] = &$playerPerformance;
} }

@ -20,16 +20,17 @@ class TeamPerformancesToTeamPerformanceDifferencesLayer extends TrueSkillFactorG
public function buildLayer() public function buildLayer()
{ {
$inputVariablesGroup = $this->getInputVariablesGroups(); $inputVariablesGroups = &$this->getInputVariablesGroups();
$inputVariablesGroupCount = count($inputVariablesGroup); $inputVariablesGroupsCount = count($inputVariablesGroups);
for ($i = 0; $i < $inputVariablesGroupCount - 1; $i++) for ($i = 0; $i < $inputVariablesGroupsCount - 1; $i++)
{ {
$strongerTeam = $inputVariablesGroups[$i][0]; $strongerTeam = $inputVariablesGroups[$i][0];
$weakerTeam = $inputVariablesGroups[$i + 1][0]; $weakerTeam = $inputVariablesGroups[$i + 1][0];
$currentDifference = $this->createOutputVariable(); $currentDifference = $this->createOutputVariable();
$this->addLayerFactor($this->createTeamPerformanceToDifferenceFactor($strongerTeam, $weakerTeam, currentDifference)); $newDifferencesFactor = $this->createTeamPerformanceToDifferenceFactor($strongerTeam, $weakerTeam, $currentDifference);
$this->addLayerFactor($newDifferencesFactor);
// REVIEW: Does it make sense to have groups of one? // REVIEW: Does it make sense to have groups of one?
$outputVariablesGroup = $this->getOutputVariablesGroups(); $outputVariablesGroup = $this->getOutputVariablesGroups();
@ -40,7 +41,9 @@ class TeamPerformancesToTeamPerformanceDifferencesLayer extends TrueSkillFactorG
private function createTeamPerformanceToDifferenceFactor( private function createTeamPerformanceToDifferenceFactor(
Variable &$strongerTeam, Variable &$weakerTeam, Variable &$output) Variable &$strongerTeam, Variable &$weakerTeam, Variable &$output)
{ {
return new GaussianWeightedSumFactor($output, array($strongerTeam, $weakerTeam), array(1.0, -1.0)); $teams = array($strongerTeam, $weakerTeam);
$weights = array(1.0, -1.0);
return new GaussianWeightedSumFactor($output, $teams, $weights);
} }
private function createOutputVariable() private function createOutputVariable()