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 some debugging messages on factors

Browse Source
This commit is contained in:
Jeff Moser 2010-09-27 08:00:22 -04:00
parent 5cb1919c21
commit f816a766d7
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PHPSkills/FactorGraphs/Message.php
View File

@ -3,14 +3,12 @@ namespace Moserware\Skills\FactorGraphs;
class Message class Message
{ {
private $_nameFormat; private $_name;
private $_nameFormatArgs;
private $_value; private $_value;
public function __construct($value = null, $nameFormat = null, $args = null) public function __construct($value = null, $name = null)
{ {
$this->_nameFormat = $nameFormat; $this->_name = $name;
$this->_nameFormatArgs = $args;
$this->_value = $value; $this->_value = $value;
} }
@ -21,7 +19,7 @@ class Message
public function __toString() public function __toString()
{ {
return $this->_nameFormat; //return (_NameFormat == null) ? base.ToString() : String.Format(_NameFormat, _NameFormatArgs); return $this->_name;
} }
} }

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

@ -34,7 +34,7 @@ abstract class GaussianFactor extends Factor
return parent::createVariableToMessageBindingWithMessage($variable, return parent::createVariableToMessageBindingWithMessage($variable,
new Message( new Message(
GaussianDistribution::fromPrecisionMean(0, 0), GaussianDistribution::fromPrecisionMean(0, 0),
"message from {0} to {1}", $this)); sprintf("message from %s to %s", $this, $variable)));
} }
} }

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

@ -22,7 +22,7 @@ class GaussianGreaterThanFactor extends GaussianFactor
public function __construct($epsilon, Variable &$variable) public function __construct($epsilon, Variable &$variable)
{ {
parent::__construct("{0} > {1:0.000}"); parent::__construct(\sprintf("%s > %.2f", $variable, $epsilon));
$this->_epsilon = $epsilon; $this->_epsilon = $epsilon;
$this->createVariableToMessageBinding($variable); $this->createVariableToMessageBinding($variable);
} }

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

@ -20,7 +20,7 @@ class GaussianLikelihoodFactor extends GaussianFactor
public function __construct($betaSquared, Variable &$variable1, Variable &$variable2) public function __construct($betaSquared, Variable &$variable1, Variable &$variable2)
{ {
parent::__construct("Likelihood of {0} going to {1}"); parent::__construct(sprintf("Likelihood of %s going to %s", $variable2, $variable1));
$this->_precision = 1.0/$betaSquared; $this->_precision = 1.0/$betaSquared;
$this->createVariableToMessageBinding($variable1); $this->createVariableToMessageBinding($variable1);
$this->createVariableToMessageBinding($variable2); $this->createVariableToMessageBinding($variable2);

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

@ -21,11 +21,10 @@ class GaussianPriorFactor extends GaussianFactor
public function __construct($mean, $variance, Variable &$variable) public function __construct($mean, $variance, Variable &$variable)
{ {
parent::__construct("Prior value going to {0}"); parent::__construct(sprintf("Prior value going to %s", $variable));
$this->_newMessage = new GaussianDistribution($mean, sqrt($variance)); $this->_newMessage = new GaussianDistribution($mean, sqrt($variance));
$newMessage = new Message(GaussianDistribution::fromPrecisionMean(0, 0), $newMessage = new Message(GaussianDistribution::fromPrecisionMean(0, 0),
"message from {0} to {1}", sprintf("message from %s to %s", $this, $variable));
$this, $variable);
$this->createVariableToMessageBindingWithMessage($variable, $newMessage); $this->createVariableToMessageBindingWithMessage($variable, $newMessage);
} }

1
PHPSkills/TrueSkill/Factors/GaussianWithinFactor.php
View File

@ -22,6 +22,7 @@ class GaussianWithinFactor extends GaussianFactor
public function __construct($epsilon, Variable &$variable) public function __construct($epsilon, Variable &$variable)
{ {
parent::__construct(sprintf("%s <= %.2f", $variable, $epsilon));
$this->_epsilon = $epsilon; $this->_epsilon = $epsilon;
$this->createVariableToMessageBinding($variable); $this->createVariableToMessageBinding($variable);
} }