Skip to content
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

Al Leonard - Completed assignement with all tests passing. #41

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stacks_queues/linked_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def remove_first(self):


def empty(self):
return not self.head
return not self.head

# method to find if the linked list contains a node with specified value
# returns true if found, false otherwise
Expand Down
49 changes: 39 additions & 10 deletions stacks_queues/queue.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

INITIAL_QUEUE_SIZE = 20

class QueueFullException(Exception):
Expand All @@ -15,48 +14,78 @@ def __init__(self):
self.front = -1
self.rear = -1
self.size = 0


def enqueue(self, element):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Adds an element to the Queue
Raises a QueueFullException if all elements
In the store are occupied
returns None
"""
pass
if ((self.rear + 1) % self.buffer_size == self.front):
raise QueueFullException("Queue full")
elif self.empty():
self.front = 0
self.rear = 0
self.store[self.rear] = element
else:
self.rear = (self.rear + 1) % self.buffer_size
self.store[self.rear] = element

def dequeue(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Removes an element from the Queue
Raises a QueueEmptyException if
Raises a QueueEmptyException if
The Queue is empty.
returns None
"""
pass
if self.empty():
raise QueueEmptyException('Queue is empty.')

data = self.store[self.front]
self.store[self.front] = None

if (self.front == self.rear):
self.front = -1
self.rear = -1
else:
self.front = (self.front + 1) % self.buffer_size
return data

def front(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Returns an element from the front
of the Queue and None if the Queue
is empty. Does not remove anything.
"""
pass

if self.empty():
return None
return self.store[self.front]

def size(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Returns the number of elements in
The Queue
"""
pass
size = self.__str__().count(",") + 1
return size

def empty(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Returns True if the Queue is empty
And False otherwise.
"""
pass
return self.front == -1

def __str__(self):

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

""" Returns the Queue in String form like:
[3, 4, 7]
Starting with the front of the Queue and
ending with the rear of the Queue.
"""
pass
if self.empty():
return "[]"

q = []
front = self.front
while front != self.rear:
q.append(self.store[front])
front += 1
front %= self.buffer_size
q.append(self.store[self.rear])
return str(q)
21 changes: 14 additions & 7 deletions stacks_queues/stack.py
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
from stacks_queues.linked_list import LinkedList
# from stacks_queues.linked_list import LinkedList

class StackEmptyException(Exception):
pass

class Stack:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The assignment was to use the LinkedList as the internal data structure for the Stack.


def __init__(self):
self.store = LinkedList()
# self.store = LinkedList()
self.st = []

def push(self, element):
""" Adds an element to the top of the Stack.
Returns None
"""
pass
# self.store.add_first(item)
self.st.append(element)


def pop(self):
""" Removes an element from the top
Expand All @@ -21,18 +23,23 @@ def pop(self):
The Stack is empty.
returns None
"""
pass
# return self.store.remove_first()
if (len(self.st)>0):
result = self.st.pop()
return result

def empty(self):
""" Returns True if the Stack is empty
And False otherwise
"""
pass
# return self.store.length() == 0
return len(self.st) == 0

def __str__(self):
""" Returns the Stack in String form like:
[3, 4, 7]
Starting with the top of the Stack and
ending with the bottom of the Stack.
"""
pass
# return str(self.store)
return str(self.st)