Cleaned up some of the run schedule parts

This commit is contained in:
Jeff Moser
2010-09-28 08:12:06 -04:00
parent 196d09429a
commit a45a1c47da
8 changed files with 21 additions and 13 deletions

View File

@ -49,7 +49,9 @@ abstract class Factor
public function updateMessageIndex($messageIndex)
{
Guard::argumentIsValidIndex($messageIndex, count($this->_messages), "messageIndex");
return $this->updateMessageVariable($this->_messages[$messageIndex], $this->_messageToVariableBinding->getValue($messageIndex));
$message = $this->_messages[$messageIndex];
$variable = $this->_messageToVariableBinding->getValue($this->_messages[$messageIndex]);
return $this->updateMessageVariable($message, $variable);
}
protected function updateMessageVariable(Message $message, Variable $variable)
@ -60,7 +62,7 @@ abstract class Factor
/// Resets the marginal of the variables a factor is connected to
public function resetMarginals()
{
foreach ($this->_messageToVariableBindings->getAllValues() as $currentVariable)
foreach ($this->_messageToVariableBinding->getAllValues() as $currentVariable)
{
$currentVariable->resetToPrior();
}
@ -69,7 +71,7 @@ abstract class Factor
/// Sends the ith message to the marginal and returns the log-normalization constant
public function sendMessageIndex($messageIndex)
{
Guard::argumentIsValidIndex($messageIndex, count($_messages), "messageIndex");
Guard::argumentIsValidIndex($messageIndex, count($this->_messages), "messageIndex");
$message = $this->_messages[$messageIndex];
$variable = $this->_messageToVariableBinding->getValue($message);

View File

@ -43,7 +43,7 @@ abstract class FactorGraphLayer
$this->_inputVariablesGroups = $value;
}
protected function scheduleSequence(&$itemsToSequence, $name)
protected function scheduleSequence($itemsToSequence, $name)
{
return new ScheduleSequence($name, $itemsToSequence);
}

View File

@ -12,11 +12,16 @@ class Message
$this->_value = $value;
}
public function getValue()
public function& getValue()
{
return $this->_value;
}
public function setValue(&$value)
{
$this->_value = &$value;
}
public function __toString()
{
return $this->_name;