Additional Psalm warnings resolving

This commit is contained in:
2023-08-08 07:00:51 +00:00
parent ec255543d9
commit aa836e859d
10 changed files with 21 additions and 20 deletions

View File

@ -30,7 +30,7 @@ abstract class GaussianFactor extends Factor
$variable,
new Message(
$newDistribution,
sprintf('message from %s to %s', $this, $variable)
sprintf('message from %s to %s', (string)$this, (string)$variable)
)
);
}

View File

@ -18,7 +18,7 @@ class GaussianGreaterThanFactor extends GaussianFactor
public function __construct(float $epsilon, Variable $variable)
{
parent::__construct(\sprintf('%s > %.2f', $variable, $epsilon));
parent::__construct(\sprintf('%s > %.2f', (string)$variable, $epsilon));
$this->epsilon = $epsilon;
$this->createVariableToMessageBinding($variable);
}

View File

@ -19,7 +19,7 @@ class GaussianLikelihoodFactor extends GaussianFactor
public function __construct(float $betaSquared, Variable $variable1, Variable $variable2)
{
parent::__construct(sprintf('Likelihood of %s going to %s', $variable2, $variable1));
parent::__construct(sprintf('Likelihood of %s going to %s', (string)$variable2, (string)$variable1));
$this->precision = 1.0 / $betaSquared;
$this->createVariableToMessageBinding($variable1);
$this->createVariableToMessageBinding($variable2);

View File

@ -17,11 +17,11 @@ class GaussianPriorFactor extends GaussianFactor
public function __construct(float $mean, float $variance, Variable $variable)
{
parent::__construct(sprintf('Prior value going to %s', $variable));
parent::__construct(sprintf('Prior value going to %s', (string)$variable));
$this->newMessage = new GaussianDistribution($mean, sqrt($variance));
$newMessage = new Message(
GaussianDistribution::fromPrecisionMean(0, 0),
sprintf('message from %s to %s', $this, $variable)
sprintf('message from %s to %s', (string)$this, (string)$variable)
);
$this->createVariableToMessageBindingWithMessage($variable, $newMessage);

View File

@ -38,7 +38,7 @@ class GaussianWeightedSumFactor extends GaussianFactor
*/
public function __construct(Variable $sumVariable, array $variablesToSum, array $variableWeights = null)
{
parent::__construct(self::createName($sumVariable, $variablesToSum, $variableWeights));
parent::__construct(self::createName((string)$sumVariable, $variablesToSum, $variableWeights));
// The first weights are a straightforward copy
// v_0 = a_1*v_1 + a_2*v_2 + ... + a_n * v_n
@ -237,7 +237,7 @@ class GaussianWeightedSumFactor extends GaussianFactor
private static function createName(string $sumVariable, array $variablesToSum, array $weights): string
{
// TODO: Perf? Use PHP equivalent of StringBuilder? implode on arrays?
$result = (string) $sumVariable;
$result = $sumVariable;
$result .= ' = ';
$totalVars = count($variablesToSum);

View File

@ -18,7 +18,7 @@ class GaussianWithinFactor extends GaussianFactor
public function __construct(float $epsilon, Variable $variable)
{
parent::__construct(sprintf('%s <= %.2f', $variable, $epsilon));
parent::__construct(sprintf('%s <= %.2f', (string)$variable, $epsilon));
$this->epsilon = $epsilon;
$this->createVariableToMessageBinding($variable);
}