refactor: added new package Nodes to segregate Nodes from Structures

.gitignore

@@ -136,6 +136,7 @@ venv.bak/
 
 # mypy
 .mypy_cache/
+out/
 .dmypy.json
 dmypy.json
 

README.md

@@ -112,7 +112,7 @@ pip install datastax
   Usage
   > py datastax <data-structure> [data]
   Data Structures:
-  ->  trees          Hierarchical DS
+  ->  Trees          Hierarchical DS
   ->  linkedlists    Linear DS
   ->  arrays         Fixed Size Linear DS
 

datastax/Arrays/AbstractArrays/Queue.py

@@ -79,3 +79,6 @@ def dequeue(self) -> Any:
     @abstractmethod
     def peek(self) -> Any:
         ...
+
+    def __len__(self):
+        return len(self.array)

datastax/Arrays/Queue.py

@@ -31,9 +31,6 @@ def dequeue(self) -> Any:
         self._front += 1
         return deleted_item
 
-    def __len__(self):
-        return len(self.array)
-
     def peek(self) -> Any:
         if self.is_empty() or self._front >= self._rear:
             return "QUEUE EMPTY"

datastax/Lists/AbstractLists/CircularLinkedList.py

@@ -1,11 +1,11 @@
-from abc import ABC
+from abc import ABC as AbstractClass
 from typing import Optional
+from datastax.Nodes.AbstractNodes import Node
 from datastax.Lists.AbstractLists.LinkedList import LinkedList
 from datastax.Utils import Commons
-from datastax.Lists.AbstractLists.Node import Node
 
 
-class CircularLinkedList(LinkedList, ABC):
+class CircularLinkedList(LinkedList, AbstractClass):
     def _max_width(self, node: Optional[Node]):
         max_width = 0
         ref = node

datastax/Lists/AbstractLists/DoublyCircularList.py

@@ -1,11 +1,10 @@
-from abc import ABC
-
+from abc import ABC as AbstractClass
 from datastax.Lists.AbstractLists.CircularLinkedList import CircularLinkedList
 from datastax.Lists.AbstractLists.DoublyLinkedList import DoublyLinkedList
 from datastax.Utils import Commons
 
 
-class DoublyCircularList(DoublyLinkedList, CircularLinkedList, ABC):
+class DoublyCircularList(DoublyLinkedList, CircularLinkedList, AbstractClass):
 
     def __str__(self):
         if not self.head:

datastax/Lists/AbstractLists/DoublyLinkedList.py

@@ -1,11 +1,11 @@
-from abc import ABC
+from abc import ABC as AbstractClass
 from typing import Optional
+from datastax.Nodes.AbstractNodes import DoublyNode
 from datastax.Lists.AbstractLists.LinkedList import LinkedList
 from datastax.Utils import Commons
-from datastax.Lists.AbstractLists.DoublyNode import DoublyNode
 
 
-class DoublyLinkedList(LinkedList, ABC):
+class DoublyLinkedList(LinkedList, AbstractClass):
     _head: Optional[DoublyNode] = None
     _tail: Optional[DoublyNode] = None
 

datastax/Lists/AbstractLists/LinkedList.py

@@ -1,7 +1,7 @@
 from typing import Any, Optional, Self, Iterable
-from datastax.Lists.AbstractLists.Node import Node
 from datastax.Utils import Commons
 from abc import abstractmethod, ABC as AbstractClass
+from datastax.Nodes.AbstractNodes import Node
 
 
 class LinkedList(AbstractClass):

datastax/Lists/AbstractLists/Queue.py

@@ -1,11 +1,11 @@
-from abc import ABC, abstractmethod
+from abc import ABC as AbstractClass, abstractmethod
 from typing import Optional, Any
+from datastax.Nodes.AbstractNodes import Node
 from datastax.Lists.AbstractLists.LinkedList import LinkedList
-from datastax.Lists.AbstractLists.Node import Node
 from datastax.Utils import Commons
 
 
-class Queue(LinkedList, ABC):
+class Queue(LinkedList, AbstractClass):
     _capacity = 0
     _rear = 0
 

datastax/Lists/AbstractLists/__init__.py

@@ -22,20 +22,16 @@
 Author: Pritam Kundu
 Date: 2023-07-10
 """
-from .Node import Node
-from .DoublyNode import DoublyNode
 from .LinkedList import LinkedList
 from .DoublyLinkedList import DoublyLinkedList
 from .CircularLinkedList import CircularLinkedList
 from .DoublyCircularList import DoublyCircularList
 from .Queue import Queue
 
 __all__ = [
-    'Node',
-    'DoublyNode',
-    'LinkedList',
-    'DoublyLinkedList',
-    'CircularLinkedList',
-    'DoublyCircularList',
-    'Queue'
+    LinkedList,
+    DoublyLinkedList,
+    CircularLinkedList,
+    DoublyCircularList,
+    Queue
 ]

datastax/Lists/DoublyLinkedList.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, Iterable, Self
 
-from datastax.Lists.DoublyNode import DoublyNode
+from datastax.Nodes import DoublyNode
 from datastax.Lists.LinkedList import LinkedList
 from datastax.Lists.AbstractLists import DoublyLinkedList as AbstractList
 

datastax/Lists/LRUCache.py

@@ -14,7 +14,7 @@
 from typing import Any
 
 from datastax.Lists.DoublyLinkedList import DoublyLinkedList
-from datastax.Lists.DoublyNode import DoublyNode
+from datastax.Nodes import DoublyNode
 
 
 class LRUCache(DoublyLinkedList):

datastax/Lists/LinkedList.py

@@ -1,6 +1,6 @@
 from typing import Any, Optional, Iterable, Self
 
-from datastax.Lists.Node import Node
+from datastax.Nodes import Node
 from datastax.Lists.AbstractLists import LinkedList as AbstractLinkedList
 
 

datastax/Lists/Queue.py

@@ -2,7 +2,7 @@
 
 from sys import maxsize
 from typing import Any, Optional, Sequence, Self
-from datastax.Lists.Node import Node
+from datastax.Nodes import Node
 from datastax.errors import OverFlowError, UnderFlowError
 from datastax.Lists.LinkedList import LinkedList
 from datastax.Lists.AbstractLists import Queue as AbstractQueue

datastax/Lists/__init__.py

@@ -1,5 +1,3 @@
-from .Node import Node
-from .DoublyNode import DoublyNode
 from .LinkedList import LinkedList
 from .DoublyLinkedList import DoublyLinkedList
 from .CircularLinkedList import CircularLinkedList
@@ -8,12 +6,10 @@
 from .Queue import Queue
 
 __all__ = [
-    'Node',
-    'DoublyNode',
-    'LinkedList',
-    'DoublyLinkedList',
-    'CircularLinkedList',
-    'DoublyCircularList',
-    'Queue',
-    'LRUCache'
+    LinkedList,
+    DoublyLinkedList,
+    CircularLinkedList,
+    DoublyCircularList,
+    Queue,
+    LRUCache
 ]

datastax/Lists/AbstractLists/DoublyNode.py → datastax/Nodes/AbstractNodes/DoublyNode.py

@@ -1,11 +1,11 @@
-from abc import ABC
+from abc import ABC as AbstractClass
 from typing import Optional, Self
 
-from datastax.Lists.AbstractLists.Node import Node
+from datastax.Nodes.AbstractNodes.Node import Node
 from datastax.Utils import Commons
 
 
-class DoublyNode(Node, ABC):
+class DoublyNode(Node, AbstractClass):
     _next: Optional[Self]
     _prev: Optional[Self]
 

datastax/Nodes/AbstractNodes/__init__.py

@@ -0,0 +1,7 @@
+from .Node import Node
+from .DoublyNode import DoublyNode
+
+__all__ = [
+    Node,
+    DoublyNode
+]

datastax/Lists/DoublyNode.py → datastax/Nodes/DoublyNode.py

@@ -1,7 +1,7 @@
 from typing import Any, Self, Optional
 
-from datastax.Lists.Node import Node
-from datastax.Lists.AbstractLists import DoublyNode as AbstractNode
+from datastax.Nodes.Node import Node
+from datastax.Nodes.AbstractNodes import DoublyNode as AbstractNode
 
 
 class DoublyNode(AbstractNode, Node):

datastax/Lists/Node.py → datastax/Nodes/Node.py

@@ -1,6 +1,6 @@
 from typing import Any, Self, Optional
 
-from datastax.Lists.AbstractLists import Node as AbstractNode
+from datastax.Nodes.AbstractNodes import Node as AbstractNode
 
 
 class Node(AbstractNode):

datastax/Nodes/__init__.py

@@ -0,0 +1,7 @@
+from .Node import Node
+from .DoublyNode import DoublyNode
+
+__all__ = [
+    Node,
+    DoublyNode
+]

datastax/trees/private_trees/huffman_tree.py → datastax/Trees/AbstractTrees/huffman_tree.py

@@ -4,7 +4,7 @@
 import math
 from typing import Any, Optional, Union
 
-from datastax.trees.private_trees.binary_tree import (
+from datastax.Trees.AbstractTrees.binary_tree import (
     BinaryTree, TreeNode,
     _node_builder, _mangled
 )

datastax/trees/private_trees/red_black_tree.py → datastax/Trees/AbstractTrees/red_black_tree.py

@@ -4,7 +4,7 @@
 from itertools import chain
 from typing import Any, Optional
 
-from datastax.trees.private_trees.binary_tree import (
+from datastax.Trees.AbstractTrees.binary_tree import (
     TreeNode,
     BinaryTree,
     _mangled,

datastax/trees/private_trees/segment_tree.py → datastax/Trees/AbstractTrees/segment_tree.py

@@ -3,7 +3,7 @@
 import math
 from typing import Any, Optional
 
-from datastax.trees.private_trees.binary_tree import (
+from datastax.Trees.AbstractTrees.binary_tree import (
     BinaryTree, TreeNode, _node_builder, _mangled
 )
 

datastax/trees/private_trees/threaded_binary_tree.py → datastax/Trees/AbstractTrees/threaded_binary_tree.py

@@ -5,14 +5,14 @@
 from typing import Optional, Any
 
 from datastax.Lists import Queue
-from datastax.trees import (
+from datastax.Trees import (
     BinaryTree,
     AVLTree,
     HeapTree,
     MinHeapTree
 )
-from datastax.trees.private_trees import binary_tree
-from datastax.trees.private_trees.binary_tree import TreeNode, _mangled
+from datastax.Trees.AbstractTrees import binary_tree
+from datastax.Trees.AbstractTrees.binary_tree import TreeNode, _mangled
 
 
 class ThreadedNode(TreeNode):

datastax/trees/avl_tree.py → datastax/Trees/avl_tree.py

@@ -5,7 +5,7 @@
 from typing import Any, Optional
 
 from datastax.errors import DuplicateNodeWarning
-from datastax.trees.binary_search_tree import BinarySearchTree, TreeNode
+from datastax.Trees.binary_search_tree import BinarySearchTree, TreeNode
 
 
 class AVLNode(TreeNode):

datastax/trees/binary_search_tree.py → datastax/Trees/binary_search_tree.py

@@ -9,7 +9,7 @@
     DeletionFromEmptyTreeWarning,
     NodeNotFoundWarning
 )
-from datastax.trees.private_trees.binary_tree import BinaryTree, TreeNode
+from datastax.Trees.AbstractTrees.binary_tree import BinaryTree, TreeNode
 
 
 class BinarySearchTree(BinaryTree):

datastax/trees/binary_tree.py → datastax/Trees/binary_tree.py

@@ -12,8 +12,8 @@
     DeletionFromEmptyTreeWarning,
 )
 from datastax.Lists import Queue
-from datastax.trees.private_trees import binary_tree
-from datastax.trees.private_trees.binary_tree import TreeNode
+from datastax.Trees.AbstractTrees import binary_tree
+from datastax.Trees.AbstractTrees.binary_tree import TreeNode
 
 
 class BinaryTree(binary_tree.BinaryTree):

datastax/trees/expression_tree.py → datastax/Trees/expression_tree.py

@@ -8,7 +8,7 @@
     UnmatchedBracketPairError, InvalidExpressionError,
     UnderFlowError, OverFlowError
 )
-from datastax.trees.private_trees.binary_tree import TreeNode, BinaryTree
+from datastax.Trees.AbstractTrees.binary_tree import TreeNode, BinaryTree
 
 
 class ExpressionTree(BinaryTree):

datastax/trees/fibonacci_tree.py → datastax/Trees/fibonacci_tree.py

@@ -3,7 +3,7 @@
 
 from typing import Optional, Any
 
-from datastax.trees.private_trees.binary_tree import BinaryTree, TreeNode
+from datastax.Trees.AbstractTrees.binary_tree import BinaryTree, TreeNode
 
 
 class FibonacciTree(BinaryTree):

datastax/trees/heap_tree.py → datastax/Trees/heap_tree.py

@@ -5,7 +5,7 @@
 from typing import Optional, Any
 
 from datastax.errors import DeletionFromEmptyTreeWarning
-from datastax.trees.private_trees.binary_tree import BinaryTree, TreeNode
+from datastax.Trees.AbstractTrees.binary_tree import BinaryTree, TreeNode
 
 
 class HeapNode(TreeNode):

datastax/trees/huffman_tree.py → datastax/Trees/huffman_tree.py

@@ -5,8 +5,8 @@
 from typing import Any, Optional, Union
 
 from datastax.Arrays import PriorityQueue
-from datastax.trees.private_trees import huffman_tree
-from datastax.trees.private_trees.huffman_tree import HuffmanNode
+from datastax.Trees.AbstractTrees import huffman_tree
+from datastax.Trees.AbstractTrees.huffman_tree import HuffmanNode
 
 
 class HuffmanTable(huffman_tree.HuffmanTable):

datastax/trees/min_heap_tree.py → datastax/Trees/min_heap_tree.py

@@ -1,7 +1,7 @@
 # Min Heap Tree Implementation
 from __future__ import annotations
 
-from datastax.trees.heap_tree import HeapTree, HeapNode
+from datastax.Trees.heap_tree import HeapTree, HeapNode
 
 
 class MinHeapTree(HeapTree):

datastax/trees/min_segment_tree.py → datastax/Trees/min_segment_tree.py

@@ -4,7 +4,7 @@
 from sys import maxsize
 from typing import Any, Optional
 
-from datastax.trees.private_trees.segment_tree import SegmentTree, SegmentNode
+from datastax.Trees.AbstractTrees.segment_tree import SegmentTree, SegmentNode
 
 
 class MinSegmentTree(SegmentTree):

datastax/trees/red_black_tree.py → datastax/Trees/red_black_tree.py

@@ -7,9 +7,9 @@
 from datastax.errors import (
     DuplicateNodeWarning
 )
-from datastax.trees.binary_search_tree import BinarySearchTree
-from datastax.trees.private_trees import red_black_tree
-from datastax.trees.private_trees.red_black_tree import (
+from datastax.Trees.binary_search_tree import BinarySearchTree
+from datastax.Trees.AbstractTrees import red_black_tree
+from datastax.Trees.AbstractTrees.red_black_tree import (
     RedBlackNode,
     BLACK, RED
 )

datastax/trees/splay_tree.py → datastax/Trees/splay_tree.py

@@ -9,7 +9,7 @@
     DeletionFromEmptyTreeWarning,
     NodeNotFoundWarning
 )
-from datastax.trees.binary_search_tree import BinarySearchTree, TreeNode
+from datastax.Trees.binary_search_tree import BinarySearchTree, TreeNode
 
 
 class SplayNode(TreeNode):

datastax/trees/sum_segment_tree.py → datastax/Trees/sum_segment_tree.py

@@ -3,7 +3,7 @@
 
 from typing import Any, Optional
 
-from datastax.trees.private_trees.segment_tree import SegmentTree, SegmentNode
+from datastax.Trees.AbstractTrees.segment_tree import SegmentTree, SegmentNode
 
 
 class SumSegmentTree(SegmentTree):