From e8d444e7da36dfd33fbeb4b7fc37ac832f1ca0ed Mon Sep 17 00:00:00 2001
From: Jeff Moser <jeff@moserware.com>
Date: Sat, 25 Sep 2010 12:50:33 -0400
Subject: [PATCH] Now it throws an error, but at least it runs something

---
 PHPSkills/FactorGraphs/FactorGraphLayer.php      |  2 +-
 PHPSkills/Team.php                               |  4 +++-
 .../Layers/IteratedTeamDifferencesInnerLayer.php |  6 +++---
 ...PlayerPerformancesToTeamPerformancesLayer.php |  3 ++-
 .../Layers/TrueSkillFactorGraphLayer.php         |  2 ++
 PHPSkills/TrueSkill/TrueSkillFactorGraph.php     | 16 ++++++++++------
 6 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/PHPSkills/FactorGraphs/FactorGraphLayer.php b/PHPSkills/FactorGraphs/FactorGraphLayer.php
index 56e2260..5a01a30 100644
--- a/PHPSkills/FactorGraphs/FactorGraphLayer.php
+++ b/PHPSkills/FactorGraphs/FactorGraphLayer.php
@@ -44,7 +44,7 @@ abstract class FactorGraphLayer
 
     protected function scheduleSequence($itemsToSequence)
     {
-        return new ScheduleSequence($itemsToSequence);
+        return new ScheduleSequence("TODO", $itemsToSequence);
     }
 
     protected function addLayerFactor($factor)
diff --git a/PHPSkills/Team.php b/PHPSkills/Team.php
index f56c425..a4e6637 100644
--- a/PHPSkills/Team.php
+++ b/PHPSkills/Team.php
@@ -6,7 +6,9 @@ require_once(dirname(__FILE__) . '/RatingContainer.php');
 class Team extends RatingContainer
 {
     public function __construct($player = null, $rating = null)
-    {        
+    {
+        parent::__construct();
+        
         if(!\is_null($player))
         {
             $this->addPlayer($player, $rating);
diff --git a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
index 9c7aaff..e1c36c7 100644
--- a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
+++ b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
@@ -29,11 +29,11 @@ class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
 
     public function buildLayer()
     {
-        $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->setRawInputVariablesGroups($this->getInputVariablesGroups());
+        $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->setInputVariablesGroups($this->getInputVariablesGroups());
         $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->buildLayer();
 
-        $this->_TeamDifferencesComparisonLayer->setRawInputVariablesGroups(
-            $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getRawOutputVariablesGroups());
+        $this->_TeamDifferencesComparisonLayer->setInputVariablesGroups(
+            $this->_TeamPerformancesToTeamPerformanceDifferencesLayer->getOutputVariablesGroups());
         $this->_TeamDifferencesComparisonLayer->buildLayer();
     }
 
diff --git a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
index d131a08..b047b71 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
@@ -27,7 +27,8 @@ class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLaye
             $this->addLayerFactor($this->createPlayerToTeamSumFactor($currentTeam, $teamPerformance));
 
             // REVIEW: Does it make sense to have groups of one?
-            $this->getOutputVariablesGroups() = $teamPerformance;
+            $outputVariablesGroups = $this->getOutputVariablesGroups();
+            $outputVariablesGroups = $teamPerformance;
         }
     }
 
diff --git a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
index 10c7c25..3525ab2 100644
--- a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
@@ -2,8 +2,10 @@
 namespace Moserware\Skills\TrueSkill\Layers;
 
 require_once(dirname(__FILE__) . "/../../FactorGraphs/FactorGraphLayer.php");
+require_once(dirname(__FILE__) . "/../TrueSkillFactorGraph.php");
 
 use Moserware\Skills\FactorGraphs\FactorGraphLayer;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
 
 abstract class TrueSkillFactorGraphLayer extends FactorGraphLayer
 {
diff --git a/PHPSkills/TrueSkill/TrueSkillFactorGraph.php b/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
index e34911b..b58bc1d 100644
--- a/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
+++ b/PHPSkills/TrueSkill/TrueSkillFactorGraph.php
@@ -1,28 +1,32 @@
 <?php
 namespace Moserware\Skills\TrueSkill;
 
+require_once(dirname(__FILE__) . '/../GameInfo.php');
 require_once(dirname(__FILE__) . '/../Rating.php');
 require_once(dirname(__FILE__) . '/../FactorGraphs/FactorGraph.php');
 require_once(dirname(__FILE__) . '/../FactorGraphs/FactorList.php');
 require_once(dirname(__FILE__) . '/../FactorGraphs/Schedule.php');
 require_once(dirname(__FILE__) . '/../FactorGraphs/VariableFactory.php');
 require_once(dirname(__FILE__) . '/../Numerics/GaussianDistribution.php');
+require_once(dirname(__FILE__) . '/Layers/IteratedTeamDifferencesInnerLayer.php');
+require_once(dirname(__FILE__) . '/Layers/PlayerPerformancesToTeamPerformancesLayer.php');
 require_once(dirname(__FILE__) . '/Layers/PlayerPriorValuesToSkillsLayer.php');
 require_once(dirname(__FILE__) . '/Layers/PlayerSkillsToPerformancesLayer.php');
-require_once(dirname(__FILE__) . '/Layers/IteratedTeamDifferencesInnerLayer.php');
-require_once(dirname(__FILE__) . '/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php');
 require_once(dirname(__FILE__) . '/Layers/TeamDifferencesComparisonLayer.php');
+require_once(dirname(__FILE__) . '/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php');
 
+use Moserware\Skills\GameInfo;
 use Moserware\Skills\Rating;
 use Moserware\Skills\FactorGraphs\FactorGraph;
 use Moserware\Skills\FactorGraphs\FactorList;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
 use Moserware\Skills\FactorGraphs\VariableFactory;
+use Moserware\Skills\TrueSkill\Layers\IteratedTeamDifferencesInnerLayer;
+use Moserware\Skills\TrueSkill\Layers\PlayerPerformancesToTeamPerformancesLayer;
 use Moserware\Skills\TrueSkill\Layers\PlayerPriorValuesToSkillsLayer;
 use Moserware\Skills\TrueSkill\Layers\PlayerSkillsToPerformancesLayer;
-use Moserware\Skills\TrueSkill\Layers\IteratedTeamDifferencesInnerLayer;
-use Moserware\Skills\TrueSkill\Layers\TeamPerformancesToTeamPerformanceDifferencesLayer;
 use Moserware\Skills\TrueSkill\Layers\TeamDifferencesComparisonLayer;
+use Moserware\Skills\TrueSkill\Layers\TeamPerformancesToTeamPerformanceDifferencesLayer;
 
 class TrueSkillFactorGraph extends FactorGraph
 {
@@ -105,7 +109,7 @@ class TrueSkillFactorGraph extends FactorGraph
             $currentPriorSchedule = $currentLayer->createPriorSchedule();
             if ($currentPriorSchedule != null)
             {
-                $fullSchedule->add($currentPriorSchedule);
+                $fullSchedule[] = $currentPriorSchedule;
             }
         }
         
@@ -116,7 +120,7 @@ class TrueSkillFactorGraph extends FactorGraph
             $currentPosteriorSchedule = $currentLayer->createPosteriorSchedule();
             if ($currentPosteriorSchedule != null)
             {
-                $fullSchedule->add($currentPosteriorSchedule);
+                $fullSchedule[] = $currentPosteriorSchedule;
             }
         }