Skip to content

Commit cb2bbf9

Browse files
Ramy-Badr-Ahmeddarwinz
Ramy-Badr-Ahmed
and
darwinz
authored
Added Extra Tests for Splay Tree Operations (TheAlgorithms#171)
* Added Disjoint Sets Data structure * Moved DisjointSetTest.php to tests/DataStructures * Update DataStructures/DisjointSets/DisjointSet.php Co-authored-by: Brandon Johnson <[email protected]> * Update DataStructures/DisjointSets/DisjointSetNode.php Co-authored-by: Brandon Johnson <[email protected]> * Update DataStructures/DisjointSets/DisjointSetNode.php Co-authored-by: Brandon Johnson <[email protected]> * Update tests/DataStructures/DisjointSetTest.php Co-authored-by: Brandon Johnson <[email protected]> * Update tests/DataStructures/DisjointSetTest.php Co-authored-by: Brandon Johnson <[email protected]> * Update tests/DataStructures/DisjointSetTest.php Co-authored-by: Brandon Johnson <[email protected]> * Considered PHPCS remarks. Unit Testing is now working. * Remove data type mixed. Considered annotations for php7.4. * Remove data type mixed. Considered annotations for php7.4. * updating DIRECTORY.md * Implemented Trie DataStructure * Added Trie to DIRECTORY.md * updating DIRECTORY.md * Implemented AVLTree DataStructure * updating DIRECTORY.md * Implemented AVLTree DataStructure * Implemented SegmentTreeNode.php * Implementing SegmentTree * Implementing SegmentTree with updateTree * Implementing SegmentTree with rangeUpdateTree * Implementing SegmentTree with query and queryTree * Added serializing and deserializing of the SegmentTree * Adding unit tests SegmentTree implementation * Added unit tests for SegmentTree updates and range updates * considering PHPCS for Added unit tests for SegmentTree updates and range updates * Added unit tests for SegmentTree serialization/deserialization and array updates reflections * Added unit tests for SegmentTree Edge Cases * Added unit tests for SegmentTree Exceptions (OutOfBoundsException, InvalidArgumentException) * Added SegmentTree to DIRECTORY.md * Implemented Segment Tree Data Structure * updating DIRECTORY.md * Added some comments to my files in: TheAlgorithms#160, TheAlgorithms#162, TheAlgorithms#163, TheAlgorithms#166. Implemented Segment Tree Data Structure. * Added some comments to my files in: TheAlgorithms#160, TheAlgorithms#162, TheAlgorithms#163, TheAlgorithms#166. Implemented Segment Tree Data Structure. * Added comments time complexity for query(), update() and buildTree() * Implemented Splay Tree Data Structure * Update tests/DataStructures/SplayTreeTest.php Co-authored-by: Brandon Johnson <[email protected]> * Implemented Splay Tree Data Structure. Added counter test for deletion. * Implemented Splay Tree Data Structure. Added counter test for multiple deletions. * Implemented Splay Tree Data Structure. Added counter test for multiple deletions. * Implemented Splay Tree Data Structure. Added abstract setRoot() declaration to the SplayTreeRotations.php * Implemented Splay Tree Data Structure. Fix for array_rand for non-array result. Rewriting. * Implemented Splay Tree Data Structure. Fix for multiple deletion test. * Implemented Splay Tree Data Structure. Added test for large splay tree operations. --------- Co-authored-by: Brandon Johnson <[email protected]> Co-authored-by: Ramy-Badr-Ahmed <[email protected]>
1 parent 3360474 commit cb2bbf9

File tree

3 files changed

+68
-6
lines changed

3 files changed

+68
-6
lines changed

‎DataStructures/SplayTree/SplayTree.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public function getRoot(): ?SplayTreeNode
4444
* Set the root node of the Splay Tree.
4545
* @param SplayTreeNode $node
4646
*/
47-
public function setRoot(SplayTreeNode $node): void
47+
protected function setRoot(SplayTreeNode $node): void
4848
{
4949
$this->root = $node;
5050
}

‎DataStructures/SplayTree/SplayTreeRotations.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
abstract class SplayTreeRotations
1414
{
1515
abstract protected function splay(?SplayTreeNode $node, int $key): ?SplayTreeNode;
16+
abstract protected function setRoot(SplayTreeNode $node): void;
1617

1718
/**
1819
* Zig rotation (single right rotation).

‎tests/DataStructures/SplayTreeTest.php‎

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?php
22

33
/*
4-
* Created by: Ramy-Badr-Ahmed (https://github.com/Ramy-Badr-Ahmed) in Pull Request: #168
5-
* https://github.com/TheAlgorithms/PHP/pull/168
4+
* Created by: Ramy-Badr-Ahmed (https://github.com/Ramy-Badr-Ahmed)
5+
* in Pull Request #168: https://github.com/TheAlgorithms/PHP/pull/168
6+
* and #171: https://github.com/TheAlgorithms/PHP/pull/171
67
*
78
* Please mention me (@Ramy-Badr-Ahmed) in any issue or pull request addressing bugs/corrections to this file.
89
* Thank you!
@@ -319,7 +320,7 @@ public function testSearchNonExistingKey()
319320

320321
$this->assertNull(
321322
$node->parent,
322-
"The last visited node must have become the new root with has no parent. Failed to splay correctly."
323+
"The last visited node must have become the new root which has no parent. Failed to splay correctly."
323324
);
324325
}
325326

@@ -390,7 +391,7 @@ public function testUpdateNonExistingKey()
390391
);
391392
$this->assertNull(
392393
$node->parent,
393-
"The last visited node must have become the new root with has no parent. Failed to splay correctly."
394+
"The last visited node must have become the new root which has no parent. Failed to splay correctly."
394395
);
395396
}
396397

@@ -401,10 +402,18 @@ public function testDeleteExistingKey()
401402
{
402403
$this->populateTree();
403404

405+
$nodesNumber = $this->tree->size();
404406
$node = $this->tree->delete(22);
405-
$isFound = $this->tree->isFound(22);
406407

408+
$isFound = $this->tree->isFound(22);
407409
$this->assertFalse($isFound, "Node with key 22 was not deleted.");
410+
411+
$this->assertEquals(
412+
$nodesNumber - 1,
413+
$this->tree->size(),
414+
"After deletion, total nodes count was not updated correctly."
415+
);
416+
408417
$this->assertEquals(
409418
20,
410419
$node->key,
@@ -441,6 +450,36 @@ public function testMergeAfterDeleteExistingKey()
441450
);
442451
}
443452

453+
/**
454+
* Tests deletion of multiple nodes and checks if the tree size is updated.
455+
*/
456+
public function testDeleteMultipleKeys()
457+
{
458+
$arrayData = [200 => "Value 200", 150 => "Value 150", 170 => "Value 170",
459+
250 => "Value 250", 300 => "Value 300", 360 => "Value 360", 230 => "Value 230",
460+
240 => "Value 240", 220 => "Value 220", 50 => "Value 50", 28 => "Value 28",
461+
164 => "Value 164", 321 => "Value 321", 40 => "Value 40"
462+
];
463+
464+
$splayTree = new SplayTree($arrayData);
465+
$treeSize = $splayTree->size();
466+
467+
$nodesToDelete = [150, 300, 50, 240, 170];
468+
$expectedSize = $treeSize - count($nodesToDelete);
469+
470+
foreach ($nodesToDelete as $key) {
471+
$splayTree->delete($key);
472+
$isFound = $this->tree->isFound($key);
473+
$this->assertFalse($isFound, "Node with key $key was not deleted.");
474+
}
475+
476+
$this->assertEquals(
477+
$expectedSize,
478+
$splayTree->size(),
479+
"After deletion, total nodes count was not updated correctly."
480+
);
481+
}
482+
444483
/**
445484
* Ensures that attempting to delete a non-existing key throws an exception and keeps the tree intact.
446485
*/
@@ -478,6 +517,28 @@ public function testOperationsOnEmptyTree()
478517
$this->assertNull($rootNode4, "Deleting a key in an empty tree should return null.");
479518
}
480519

520+
/**
521+
* Test insert, search, delete on large trees
522+
*/
523+
public function testLargeTree(): void
524+
{
525+
// Inserting a large number of nodes
526+
for ($i = 1; $i <= 1000; $i++) {
527+
$this->tree->insert($i, "Value $i");
528+
}
529+
530+
// Verify that all inserted nodes can be searched
531+
for ($i = 1; $i <= 1000; $i++) {
532+
$this->assertEquals("Value $i", $this->tree->search($i)->value, "Value for key $i should be 'Value $i'");
533+
}
534+
535+
// Verify that all inserted nodes can be deleted
536+
for ($i = 1; $i <= 5; $i++) {
537+
$this->tree->delete($i);
538+
$this->assertFalse($this->tree->isFound($i), "Node was not deleted correctly");
539+
}
540+
}
541+
481542

482543
// ------------- Test 6 Rotation types of the Splay Tree -------------
483544

0 commit comments

Comments
 (0)