From f2eca28f299bea4eabeb47c191a6d69d64730a11 Mon Sep 17 00:00:00 2001
From: Jeff Moser <jeff@moserware.com>
Date: Sat, 18 Sep 2010 21:19:51 -0400
Subject: [PATCH] Added more header stuff (requires and uses) along with a
 forgotten PartialPlay

---
 PHPSkills/Elo/GaussianEloCalculator.php       |  8 +++++
 PHPSkills/FactorGraphs/FactorGraphLayer.php   |  3 +-
 PHPSkills/FactorGraphs/FactorList.php         |  2 ++
 PHPSkills/FactorGraphs/VariableFactory.php    |  4 ++-
 .../FactorGraphTrueSkillCalculator.php        | 31 +++++++++++++++++--
 .../IteratedTeamDifferencesInnerLayer.php     |  4 ++-
 ...yerPerformancesToTeamPerformancesLayer.php |  4 ++-
 .../Layers/PlayerPriorValuesToSkillsLayer.php | 16 ++++++++--
 .../PlayerSkillsToPerformancesLayer.php       | 11 ++++++-
 .../Layers/TeamDifferencesComparisonLayer.php | 12 ++++++-
 ...ancesToTeamPerformanceDifferencesLayer.php | 11 ++++++-
 .../Layers/TrueSkillFactorGraphLayer.php      |  5 ++-
 PartialPlay.php                               | 30 ++++++++++++++++++
 13 files changed, 129 insertions(+), 12 deletions(-)
 create mode 100644 PartialPlay.php

diff --git a/PHPSkills/Elo/GaussianEloCalculator.php b/PHPSkills/Elo/GaussianEloCalculator.php
index ff16154..717e3e3 100644
--- a/PHPSkills/Elo/GaussianEloCalculator.php
+++ b/PHPSkills/Elo/GaussianEloCalculator.php
@@ -1,6 +1,14 @@
 <?php
 namespace Moserware\Skills\Elo;
 
+require_once(dirname(__FILE__) . "/../GameInfo.php");
+require_once(dirname(__FILE__) . "/../Numerics/GaussianDistribution.php");
+require_once(dirname(__FILE__) . "/KFactor.php");
+require_once(dirname(__FILE__) . "/TwoPlayerEloCalculator.php");
+
+use Moserware\Skills\GameInfo;
+use Moserware\Numerics\GaussianDistribution;
+
 class GaussianEloCalculator extends TwoPlayerEloCalculator
 {
     // From the paper
diff --git a/PHPSkills/FactorGraphs/FactorGraphLayer.php b/PHPSkills/FactorGraphs/FactorGraphLayer.php
index 7fa7f5a..bee99d4 100644
--- a/PHPSkills/FactorGraphs/FactorGraphLayer.php
+++ b/PHPSkills/FactorGraphs/FactorGraphLayer.php
@@ -1,6 +1,8 @@
 <?php
 namespace Moserware\Skills\FactorGraphs;
 
+require_once(dirname(__FILE__) . "Schedule.php");
+
 abstract class FactorGraphLayer
 {
     private $_localFactors = array();
@@ -63,5 +65,4 @@ abstract class FactorGraphLayer
     }
 }
 
-
 ?>
diff --git a/PHPSkills/FactorGraphs/FactorList.php b/PHPSkills/FactorGraphs/FactorList.php
index a875e5f..97d9d99 100644
--- a/PHPSkills/FactorGraphs/FactorList.php
+++ b/PHPSkills/FactorGraphs/FactorList.php
@@ -2,6 +2,8 @@
 
 namespace Moserware\Skills\FactorGraphs;
 
+require_once(dirname(__FILE__) . "Factor.php");
+
 /// <summary>
 /// Helper class for computing the factor graph's normalization constant.
 /// </summary>
diff --git a/PHPSkills/FactorGraphs/VariableFactory.php b/PHPSkills/FactorGraphs/VariableFactory.php
index 08c4900..0f13683 100644
--- a/PHPSkills/FactorGraphs/VariableFactory.php
+++ b/PHPSkills/FactorGraphs/VariableFactory.php
@@ -2,6 +2,8 @@
 
 namespace Moserware\Skills\FactorGraphs;
 
+require_once(dirname(__FILE__) . "Variable.php");
+
 class VariableFactory
 {
     // using a Func<TValue> to encourage fresh copies in case it's overwritten
@@ -23,6 +25,6 @@ class VariableFactory
         $newVar = new KeyedVariable($key, $this->_variablePriorInitializer());
         return $newVar;
     }
-}s
+}
 
 ?>
diff --git a/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php b/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
index 2765c62..695867e 100644
--- a/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
+++ b/PHPSkills/TrueSkill/FactorGraphTrueSkillCalculator.php
@@ -2,6 +2,34 @@
 
 namespace Moserware\Skills\TrueSkill;
 
+require_once(dirname(__FILE__) . "/../GameInfo.php");
+require_once(dirname(__FILE__) . "/../Guard.php");
+require_once(dirname(__FILE__) . "/../ISupportPartialPlay.php");
+require_once(dirname(__FILE__) . "/../ISupportPartialUpdate.php");
+require_once(dirname(__FILE__) . "/../PartialPlay.php");
+require_once(dirname(__FILE__) . "/../PlayersRange.php");
+require_once(dirname(__FILE__) . "/../RankSorter.php");
+require_once(dirname(__FILE__) . "/../SkillCalculator.php");
+require_once(dirname(__FILE__) . "/../TeamsRange.php");
+require_once(dirname(__FILE__) . "/../Numerics/BasicMath.php");
+require_once(dirname(__FILE__) . "/../Numerics/Matrix.php");
+require_once(dirname(__FILE__) . "/TrueSkillFactorGraph.php");
+
+use Moserware\Numerics\DiagonalMatrix;
+use Moserware\Numerics\Matrix;
+use Moserware\Numerics\Vector;
+
+use Moserware\Skills\GameInfo;
+use Moserware\Skills\Guard;
+use Moserware\Skills\ISupportPartialPlay;
+use Moserware\Skills\ISupportPartialUpdate;
+use Moserware\Skills\PartialPlay;
+use Moserware\Skills\PlayersRange;
+use Moserware\Skills\RankSorter;
+use Moserware\Skills\SkillCalculator;
+use Moserware\Skills\SkillCalculatorSupportedOptions;
+use Moserware\Skills\TeamsRange;
+
 /// <summary>
 /// Calculates TrueSkill using a full factor graph.
 /// </summary>
@@ -30,12 +58,11 @@ class FactorGraphTrueSkillCalculator extends SkillCalculator
         return $factorGraph->getUpdatedRatings();
     }
 
-
     public function calculateMatchQuality(GameInfo $gameInfo,
                                           array $teams)
     {
         // We need to create the A matrix which is the player team assigments.
-        $teamAssignmentsList = $teams.ToList();
+        $teamAssignmentsList = $teams;
         $skillsMatrix = $this->getPlayerCovarianceMatrix($teamAssignmentsList);
         $meanVector = $this->getPlayerMeansVector($teamAssignmentsList);
         $meanVectorTranspose = $meanVector->getTranspose();
diff --git a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
index b427617..b830381 100644
--- a/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
+++ b/PHPSkills/TrueSkill/Layers/IteratedTeamDifferencesInnerLayer.php
@@ -1,14 +1,16 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
 require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
 require_once(dirname(__FILE__) . "TeamPerformancesToTeamPerformanceDifferencesLayer.php");
 require_once(dirname(__FILE__) . "TeamDifferencesComparisonLayer.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleLoop;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
 use Moserware\Skills\FactorGraphs\ScheduleStep;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
 
 // The whole purpose of this is to do a loop on the bottom
 class IteratedTeamDifferencesInnerLayer extends TrueSkillFactorGraphLayer
diff --git a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
index 638fcbf..b65b60d 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerPerformancesToTeamPerformancesLayer.php
@@ -1,14 +1,16 @@
 <?php
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
+require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
 require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
 require_once(dirname(__FILE__) . "TeamPerformancesToTeamPerformanceDifferencesLayer.php");
 require_once(dirname(__FILE__) . "TeamDifferencesComparisonLayer.php");
-require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.php");
 
 use Moserware\Skills\FactorGraphs\ScheduleLoop;
 use Moserware\Skills\FactorGraphs\ScheduleSequence;
 use Moserware\Skills\FactorGraphs\ScheduleStep;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
 
 class PlayerPerformancesToTeamPerformancesLayer extends TrueSkillFactorGraphLayer
 {
diff --git a/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php b/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
index aedf59c..1b5f340 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerPriorValuesToSkillsLayer.php
@@ -1,7 +1,18 @@
 <?php
-
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.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\FactorGraphs\ScheduleLoop;
+use Moserware\Skills\FactorGraphs\ScheduleSequence;
+use Moserware\Skills\FactorGraphs\ScheduleStep;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
+use Moserware\Skills\TrueSkill\Factors\GaussianPriorFactor;
+
 // We intentionally have no Posterior schedule since the only purpose here is to
 class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
 {
@@ -26,7 +37,8 @@ class PlayerPriorValuesToSkillsLayer extends TrueSkillFactorGraphLayer
                 $currentTeamSkills[] = $playerSkill;
             }
 
-            OutputVariablesGroups.Add(currentTeamSkills);
+            $outputVariablesGroups = $this->getOutputVariablesGroups();
+            $outputVariablesGroups[] = $currentTeamSkills;
         }
     }
 
diff --git a/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php b/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
index 9e52fb6..95e40b4 100644
--- a/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/PlayerSkillsToPerformancesLayer.php
@@ -1,7 +1,16 @@
 <?php
-
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/Schedule.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\TrueSkill\TrueSkillFactorGraph;
+use Moserware\Skills\TrueSkill\Factors\GaussianLikelihoodFactor;
+
 class PlayerSkillsToPerformancesLayer extends TrueSkillFactorGraphLayer
 {
     public function __construct(TrueSkillFactorGraph $parentGraph)
diff --git a/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php b/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
index 4468688..fbd6d72 100644
--- a/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TeamDifferencesComparisonLayer.php
@@ -1,7 +1,17 @@
 <?php
-
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../DrawMargin.php");
+require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "../Factors/GaussianGreaterThanFactor.php");
+require_once(dirname(__FILE__) . "../Factors/GaussianWithinFactor.php");
+require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+
+use Moserware\Skills\TrueSkill\DrawMargin;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
+use Moserware\Skills\TrueSkill\Factors\GaussianGreaterThanFactor;
+use Moserware\Skills\TrueSkill\Factors\GaussianWithinFactor;
+
 class TeamDifferencesComparisonLayer extends TrueSkillFactorGraphLayer
 {
     private $_epsilon;
diff --git a/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php b/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
index ee42181..6a647d9 100644
--- a/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TeamPerformancesToTeamPerformanceDifferencesLayer.php
@@ -1,7 +1,16 @@
 <?php
-
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/Variable.php");
+require_once(dirname(__FILE__) . "../TrueSkillFactorGraph.php");
+require_once(dirname(__FILE__) . "../Factors/GaussianWeightedSumFactor.php");
+require_once(dirname(__FILE__) . "TrueSkillFactorGraphLayer.php");
+
+use Moserware\Skills\FactorGraphs\Variable;
+use Moserware\Skills\TrueSkill\DrawMargin;
+use Moserware\Skills\TrueSkill\TrueSkillFactorGraph;
+use Moserware\Skills\TrueSkill\Factors\GaussianWeightedSumFactor;
+
 class TeamPerformancesToTeamPerformanceDifferencesLayer extends TrueSkillFactorGraphLayer
 {
     public function __construct(TrueSkillFactorGraph $parentGraph)
diff --git a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
index df2193c..c086aa3 100644
--- a/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
+++ b/PHPSkills/TrueSkill/Layers/TrueSkillFactorGraphLayer.php
@@ -1,7 +1,10 @@
 <?php
-
 namespace Moserware\Skills\TrueSkill\Layers;
 
+require_once(dirname(__FILE__) . "../../FactorGraphs/FactorGraphLayer.php");
+
+use Moserware\Skills\FactorGraphs\FactorGraphLayer;
+
 abstract class TrueSkillFactorGraphLayer extends FactorGraphLayer
 {
     public function __construct(TrueSkillFactorGraph $parentGraph)
diff --git a/PartialPlay.php b/PartialPlay.php
new file mode 100644
index 0000000..c1d6c73
--- /dev/null
+++ b/PartialPlay.php
@@ -0,0 +1,30 @@
+<?php
+namespace Moserware\Skills;
+
+require_once(dirname(__FILE__) . "/ISupportPartialPlay.php");
+
+class PartialPlay
+{
+    public static function getPartialPlayPercentage($player)
+    {
+        // If the player doesn't support the interface, assume 1.0 == 100%
+        $supportsPartialPlay = $player instanceof ISupportPartialPlay;
+        if (!$supportsPartialPlay)
+        {
+            return 1.0;
+        }
+
+        $partialPlayPercentage = $partialPlay->getPartialPlayPercentage();
+
+        // HACK to get around bug near 0
+        $smallestPercentage = 0.0001;
+        if ($partialPlayPercentage < $smallestPercentage)
+        {
+            $partialPlayPercentage = $smallestPercentage;
+        }
+
+        return $partialPlayPercentage;
+    }
+}
+
+?>