Merge branch 'develop' of https://github.com/Karaka-Management/phpOMS into develop

This commit is contained in:
Dennis Eichhorn 2022-11-06 18:27:37 +01:00
commit ce8c46292c
6 changed files with 13 additions and 6 deletions

View File

@ -60,6 +60,13 @@ jobs:
ports: ports:
- 5432:5432 - 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3 options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
mssql:
image: mcr.microsoft.com/mssql/server:2019-latest
env:
SA_PASSWORD: c0MplicatedP@ssword
ACCEPT_EULA: 'Y'
ports:
- 1433:1433
redis: redis:
image: redis image: redis
ports: ports:

View File

@ -248,7 +248,7 @@ final class BasicOcr
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function match(string $path, int $comparison = 3, int $limit = 0) : array public function matchImage(string $path, int $comparison = 3, int $limit = 0) : array
{ {
// @todo: implement image reading if it isn't an mnist file // @todo: implement image reading if it isn't an mnist file
$Xtest = $this->readImages($path, $limit); $Xtest = $this->readImages($path, $limit);

View File

@ -129,7 +129,7 @@ final class Dispatcher implements DispatcherInterface
$views[$controller] = $data === null ? $function() : $function(...$data); $views[$controller] = $data === null ? $function() : $function(...$data);
} elseif ($c === 2) { } elseif ($c === 2) {
$obj = $this->getController($dispatch[0]); $obj = $this->getController($dispatch[0]);
$views[$controller] = $data === null $views[$controller] = $data === null
? $obj->{$dispatch[1]}() ? $obj->{$dispatch[1]}()
: $obj->{$dispatch[1]}(...$data); : $obj->{$dispatch[1]}(...$data);

View File

@ -123,7 +123,7 @@ final class NaiveBayesClassifier
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function match(string $criteria, array $toMatch, int $minimum = 3) : float public function matchCriteria(string $criteria, array $toMatch, int $minimum = 3) : float
{ {
$this->preCalculateProbabilities($toMatch); $this->preCalculateProbabilities($toMatch);

View File

@ -38,7 +38,7 @@ final class BasicOcrTest extends \PHPUnit\Framework\TestCase
['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1], ['label' => 0, 'prob' => 1],
['label' => 4, 'prob' => 2 / 3], ['label' => 9, 'prob' => 1 / 3], ['label' => 4, 'prob' => 2 / 3], ['label' => 4, 'prob' => 2 / 3], ['label' => 9, 'prob' => 1 / 3], ['label' => 4, 'prob' => 2 / 3],
], ],
$ocr->match(__DIR__ . '/t10k-images-idx3-ubyte', 3, 5) $ocr->matchImage(__DIR__ . '/t10k-images-idx3-ubyte', 3, 5)
); );
} }

View File

@ -69,7 +69,7 @@ final class NaiveBayesClassifierTest extends \PHPUnit\Framework\TestCase
self::assertEqualsWithDelta( self::assertEqualsWithDelta(
0.6, 0.6,
$filter->match('play', ['weather' => ['Sunny']], 1), $filter->matchCriteria('play', ['weather' => ['Sunny']], 1),
0.01 0.01
); );
} }
@ -86,7 +86,7 @@ final class NaiveBayesClassifierTest extends \PHPUnit\Framework\TestCase
self::assertEqualsWithDelta( self::assertEqualsWithDelta(
0.999988, 0.999988,
$filter->match('female', ['height' => 6, 'weight' => 130, 'foot' => 8]), $filter->matchCriteria('female', ['height' => 6, 'weight' => 130, 'foot' => 8]),
0.01 0.01
); );
} }