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

Tanya – Pine #37

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
48 changes: 41 additions & 7 deletions stacks_queues/queue.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,47 +15,81 @@ 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.size == 0:
self.front = 0

elif self.size == self.buffer_size:
raise QueueFullException('Queue is full!')

self.rear = (self.rear + 1) % self.buffer_size
self.store[self.rear] = element
self.size += 1
return None

def dequeue(self):

Choose a reason for hiding this comment

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

""" Removes and returns an element from the Queue
Raises a QueueEmptyException if
The Queue is empty.
"""
pass
if self.size == 0:
raise QueueEmptyException
else:
temp = self.store[self.front]
self.store[self.front] = None
self.front = (self.front + 1) % self.buffer_size
self.size -= 1
return temp


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
return 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
return self.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
if self.size == 0:
return True
else:
return False

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
list = []

if self.size == 0:
return list

current = self.front

while current != self.rear:
if current != None:
list.append(self.store[current])
current = (current + 1) % self.buffer_size

list.append(self.store[self.rear])

return str(list)
9 changes: 5 additions & 4 deletions stacks_queues/stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ def push(self, element):
""" Adds an element to the top of the Stack.
Returns None
"""
pass
self.store.add_first(element)

Choose a reason for hiding this comment

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


def pop(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 top
Expand All @@ -21,18 +21,19 @@ def pop(self):
The Stack is empty.
returns None
"""
pass
return self.store.remove_first()

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 Stack is empty
And False otherwise
"""
pass
return self.store.empty()


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 self.store.__str__()

Choose a reason for hiding this comment

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

Defining the __str__ method in a class is what we call operator overloading -- Python will convert any object to a string with the str() method by default, but it may not always be what we want. By defining the __str__ method, we can overwrite Python's default behavior to behavior that we want. However, when we call the overloaded method on an instance of the class, we do not need the dunders, we can just say str(object_instance)

Suggested change
return self.store.__str__()
return str(self.store)