-
Notifications
You must be signed in to change notification settings - Fork 61
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
Scissors - Hena #40
base: master
Are you sure you want to change the base?
Scissors - Hena #40
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -15,48 +15,79 @@ def __init__(self): | |||||||
self.front = -1 | ||||||||
self.rear = -1 | ||||||||
self.size = 0 | ||||||||
|
||||||||
|
||||||||
def enqueue(self, element): | ||||||||
""" Adds an element to the Queue | ||||||||
Raises a QueueFullException if all elements | ||||||||
In the store are occupied | ||||||||
returns None | ||||||||
""" | ||||||||
pass | ||||||||
if self.size == self.buffer_size: | ||||||||
raise QueueFullException("The queue is full.") | ||||||||
|
||||||||
elif self.front == -1: | ||||||||
self.front = 0 | ||||||||
self.rear = 0 | ||||||||
self.store[self.rear] = element | ||||||||
self.size += 1 | ||||||||
return self.store | ||||||||
|
||||||||
else: | ||||||||
self.rear = (self.rear + 1) % self.buffer_size | ||||||||
self.store[self.rear] = element | ||||||||
self.size +=1 | ||||||||
return self.store | ||||||||
|
||||||||
def dequeue(self): | ||||||||
""" Removes an element from the Queue | ||||||||
Raises a QueueEmptyException if | ||||||||
The Queue is empty. | ||||||||
returns None | ||||||||
""" | ||||||||
Comment on lines
42
to
47
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 |
||||||||
pass | ||||||||
if self.front == -1: | ||||||||
raise QueueEmptyException("The queue is empty.") | ||||||||
|
||||||||
element = self.store[self.front] | ||||||||
self.front = (self.front + 1) % self.buffer_size | ||||||||
self.size -= 1 | ||||||||
return element | ||||||||
|
||||||||
def front(self): | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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): | ||||||||
""" Returns the number of elements in | ||||||||
The Queue | ||||||||
""" | ||||||||
pass | ||||||||
return self.size() | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This would end up with infinite recursion
Suggested change
|
||||||||
|
||||||||
def empty(self): | ||||||||
""" Returns True if the Queue is empty | ||||||||
And False otherwise. | ||||||||
""" | ||||||||
pass | ||||||||
if self.size == 0: | ||||||||
return True | ||||||||
Comment on lines
+76
to
+77
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||||
|
||||||||
def __str__(self): | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||||||||
queue_list = [] | ||||||||
|
||||||||
if self.empty(): | ||||||||
return str(queue_list) | ||||||||
|
||||||||
for element in range(self.front, self.front + self.size): | ||||||||
element = element % self.buffer_size | ||||||||
queue_list.append(self.store[element]) | ||||||||
return str(queue_list) |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍 The stack methods work. |
||
|
||
def pop(self): | ||
""" Removes an element from the top | ||
|
@@ -21,18 +21,18 @@ def pop(self): | |
The Stack is empty. | ||
returns None | ||
""" | ||
pass | ||
return self.store.remove_first() | ||
|
||
def empty(self): | ||
""" 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 str(self.store) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍