Skip to content

Tests for queue and stack updated #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 17, 2020
Prev Previous commit
Next Next commit
removed implementation classes from global namespace
  • Loading branch information
Harsheet-saxena committed Mar 16, 2020
commit c221824a29e7305015bf50d494489e0391ee29e6
8 changes: 2 additions & 6 deletions pydatastructs/miscellaneous_data_structures/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,11 @@
__all__.extend(binomial_trees.__all__)

from .stack import (
Stack,
ArrayStack,
LinkedListStack
Stack
)
__all__.extend(stack.__all__)

from .queue import (
Queue,
ArrayQueue,
LinkedListQueue
Queue
)
__all__.extend(queue.__all__)
6 changes: 1 addition & 5 deletions pydatastructs/miscellaneous_data_structures/queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
from copy import deepcopy as dc

__all__ = [
'Queue',
'ArrayQueue',
'LinkedListQueue'
'Queue'
]

class Queue(object):
Expand Down Expand Up @@ -75,8 +73,6 @@ class ArrayQueue(Queue):

def __new__(cls, items=None, dtype=NoneType):
if items is None:
#TODO: Better implementation of ArrayQueue(items=None, dtype=NoneType)
dtype = int
items = DynamicOneDimensionalArray(dtype, 0)
else:
dtype = type(items[0])
Expand Down
4 changes: 0 additions & 4 deletions pydatastructs/miscellaneous_data_structures/stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

__all__ = [
'Stack',
'ArrayStack',
'LinkedListStack'
]

class Stack(object):
Expand Down Expand Up @@ -84,8 +82,6 @@ class ArrayStack(Stack):

def __new__(cls, items=None, dtype=NoneType):
if items is None:
#TODO: Better implementation of ArrayStack(items=None, dtype=NoneType)
dtype = int
items = DynamicOneDimensionalArray(dtype, 0)
else:
items = DynamicOneDimensionalArray(dtype, items)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
from pydatastructs.miscellaneous_data_structures import (
Queue, ArrayQueue, LinkedListQueue)
from pydatastructs.miscellaneous_data_structures import Queue
from pydatastructs.utils.raises_util import raises

def test_Queue():
Expand All @@ -8,11 +7,9 @@ def test_Queue():
q1 = Queue(implementation='linked_list')

def test_ArrayQueue():
q = ArrayQueue()
q1 = Queue()
raises(IndexError, lambda: q1.popleft())
q1 = Queue(implementation='array', items=[0])
assert type(q) == type(q1)
q1.append(1)
q1.append(2)
q1.append(3)
Expand All @@ -26,9 +23,7 @@ def test_ArrayQueue():
assert len(q1) == 0

def test_LinkedListQueue():
q = LinkedListQueue()
q1 = Queue(implementation='linked_list')
assert type(q) == type(q1)
q1.append(1)
assert raises(TypeError, lambda: Queue(implementation='linked_list', items={0, 1}))
q1 = Queue(implementation='linked_list', items = [0, 1])
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from pydatastructs.miscellaneous_data_structures import Stack, ArrayStack, LinkedListStack
from pydatastructs.miscellaneous_data_structures import Stack
from pydatastructs.linear_data_structures import OneDimensionalArray
from pydatastructs.utils.raises_util import raises

Expand All @@ -8,7 +8,7 @@ def test_Stack():
s = Stack(implementation='linked_list')

def test_ArrayStack():
s = ArrayStack()
s = Stack(implementation='array')
s.push(1)
s.push(2)
s.push(3)
Expand Down