Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-12 06:48:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-10-22 20:05:14 +00:00
parent d8e0d40c6a
commit 941bdac44e
5 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Math/Topology/Kernel2D.php
View File

@ -104,7 +104,7 @@ final class Kernel2D
public static function quarticKernel(float $distance, float $bandwidth) : float public static function quarticKernel(float $distance, float $bandwidth) : float
{ {
if (\abs($distance) <= $bandwidth / 2) { if (\abs($distance) <= $bandwidth / 2) {
$u = \abs($distance) / ($bandwidth / 2); $u = $distance / ($bandwidth / 2);
return (15 / 16) * (1 - $u * $u) * (1 - $u * $u) / ($bandwidth / 2); return (15 / 16) * (1 - $u * $u) * (1 - $u * $u) / ($bandwidth / 2);
} else { } else {
@ -125,7 +125,7 @@ final class Kernel2D
public static function triweightKernel(float $distance, float $bandwidth) : float public static function triweightKernel(float $distance, float $bandwidth) : float
{ {
if (\abs($distance) <= $bandwidth / 2) { if (\abs($distance) <= $bandwidth / 2) {
$u = \abs($distance) / ($bandwidth / 2); $u = $distance / ($bandwidth / 2);
return (35 / 32) * (1 - $u * $u) * (1 - $u * $u) * (1 - $u * $u) / ($bandwidth / 2); return (35 / 32) * (1 - $u * $u) * (1 - $u * $u) * (1 - $u * $u) / ($bandwidth / 2);
} else { } else {
@ -166,7 +166,7 @@ final class Kernel2D
*/ */
public static function gaussianKernel(float $distance, float $bandwidth) : float public static function gaussianKernel(float $distance, float $bandwidth) : float
{ {
return \exp(-($distance * $distance) / (2 * $bandwidth * $bandwidth)) / ($bandwidth * \sqrt(2 * \M_PI)); return \exp(-($distance * $distance) / (2 * $bandwidth * $bandwidth / 4)) / ($bandwidth / 2 * \sqrt(2 * \M_PI));
} }
/** /**
@ -182,7 +182,7 @@ final class Kernel2D
public static function cosineKernel(float $distance, float $bandwidth) : float public static function cosineKernel(float $distance, float $bandwidth) : float
{ {
return \abs($distance) <= $bandwidth / 2 return \abs($distance) <= $bandwidth / 2
? (\M_PI / 4) * \cos(\M_PI * $distance / $bandwidth) / ($bandwidth / 2) ? \M_PI / 4 * \cos(\M_PI / 2 * ($distance / ($bandwidth / 2)))
: 0.0; : 0.0;
} }

10
Stdlib/Tree/BinarySearchTree.php
View File

@ -53,7 +53,7 @@ class BinarySearchTree
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function &search(mixed $data) : ?Node public function search(mixed $data) : ?Node
{ {
if ($this->root === null) { if ($this->root === null) {
return null; return null;
@ -222,7 +222,7 @@ class BinarySearchTree
* *
* @since 1.0.0 * @since 1.0.0
*/ */
public function delete(Node &$node) : void public function delete(Node $node) : void
{ {
if ($node->left === null && $node->right === null) { if ($node->left === null && $node->right === null) {
if ($node->parent !== null) { if ($node->parent !== null) {
@ -237,7 +237,7 @@ class BinarySearchTree
} }
} }
$node = null; //$node = null;
return; return;
} }
@ -263,7 +263,7 @@ class BinarySearchTree
$temp->parent = $node->parent; $temp->parent = $node->parent;
$node = null; //$node = null;
return; return;
} }
@ -288,7 +288,7 @@ class BinarySearchTree
$temp->parent = $node->parent; $temp->parent = $node->parent;
$node = null; //$node = null;
return; return;
} elseif (($temp = $this->successor($node)) !== null) { } elseif (($temp = $this->successor($node)) !== null) {

14
tests/Math/Topology/Kernel2DTest.php
View File

@ -55,7 +55,7 @@ final class Kernel2DTest extends \PHPUnit\Framework\TestCase
public function testQuartic() : void public function testQuartic() : void
{ {
self::assertEquals(15 / 6, Kernel2D::quarticKernel(0, 2)); self::assertEquals(15 / 16, Kernel2D::quarticKernel(0, 2));
self::assertEquals(0.0, Kernel2D::quarticKernel(-1, 2)); self::assertEquals(0.0, Kernel2D::quarticKernel(-1, 2));
self::assertEquals(0.0, Kernel2D::quarticKernel(1, 2)); self::assertEquals(0.0, Kernel2D::quarticKernel(1, 2));
@ -85,12 +85,12 @@ final class Kernel2DTest extends \PHPUnit\Framework\TestCase
public function testGaussian() : void public function testGaussian() : void
{ {
self::assertEquals(1 / \sqrt(2 * \M_PI), Kernel2D::gaussianKernel(0, 2)); self::assertEqualsWithDelta(1 / \sqrt(2 * \M_PI), Kernel2D::gaussianKernel(0, 2), 0.001);
self::assertEquals(0.0, Kernel2D::gaussianKernel(-1, 2)); self::assertEqualsWithDelta(0.24197072451914, Kernel2D::gaussianKernel(-1, 2), 0.001);
self::assertEquals(0.0, Kernel2D::gaussianKernel(1, 2)); self::assertEqualsWithDelta(0.24197072451914, Kernel2D::gaussianKernel(1, 2), 0.001);
self::assertEquals(0.0, Kernel2D::gaussianKernel(2, 2)); self::assertEqualsWithDelta(0.004431848411938, Kernel2D::gaussianKernel(2, 2), 0.001);
self::assertEquals(0.0, Kernel2D::gaussianKernel(-2, 2)); self::assertEqualsWithDelta(0.004431848411938, Kernel2D::gaussianKernel(-2, 2), 0.001);
} }
public function testCosine() : void public function testCosine() : void
@ -105,7 +105,7 @@ final class Kernel2DTest extends \PHPUnit\Framework\TestCase
public function testLogistic() : void public function testLogistic() : void
{ {
self::assertEquals(0.5, Kernel2D::logisticKernel(0, 2)); self::assertEquals(0.25, Kernel2D::logisticKernel(0, 2));
self::assertEquals(0.0, Kernel2D::logisticKernel(-1, 2)); self::assertEquals(0.0, Kernel2D::logisticKernel(-1, 2));
self::assertEquals(0.0, Kernel2D::logisticKernel(1, 2)); self::assertEquals(0.0, Kernel2D::logisticKernel(1, 2));

1
tests/Message/RequestAbstractTest.php
View File

@ -110,7 +110,6 @@ final class RequestAbstractTest extends \PHPUnit\Framework\TestCase
{ {
$this->request->setData('asdf', '[1,2,3]'); $this->request->setData('asdf', '[1,2,3]');
self::assertEquals([1,2,3], $this->request->getDataJson('asdf')); self::assertEquals([1,2,3], $this->request->getDataJson('asdf'));
self::assertEquals([1,2,3], $this->request->getData('asdf', 'json'));
} }
/** /**

4
tests/Message/ResponseAbstractTest.php
View File

@ -137,8 +137,8 @@ final class ResponseAbstractTest extends \PHPUnit\Framework\TestCase
public function testDataDateTimeInputOutput() : void public function testDataDateTimeInputOutput() : void
{ {
$this->response->set('asdf', '2023-01-01'); $this->response->set('asdf', '2023-01-01');
self::assertEquals((new \DateTime('2023-01-01'))->format('Y-m-d'), $this->response->getDataDateTime('asdf')); self::assertEquals((new \DateTime('2023-01-01'))->format('Y-m-d'), $this->response->getDataDateTime('asdf')->format('Y-m-d'));
self::assertEquals((new \DateTime('2023-01-01'))->format('Y-m-d'), $this->response->getData('asdf', 'float')); self::assertEquals((new \DateTime('2023-01-01'))->format('Y-m-d'), $this->response->getData('asdf', 'DateTime')->format('Y-m-d'));
} }
public function testDataInvalidTypeInputOutput() : void public function testDataInvalidTypeInputOutput() : void