Dani Sanchez - Paper

stacks_queues/queue.py

@@ -12,7 +12,7 @@ class Queue:
     def __init__(self):
         self.store = [None] * INITIAL_QUEUE_SIZE
         self.buffer_size = INITIAL_QUEUE_SIZE
-        self.front = -1
+        self.front = 0
         self.rear = -1
         self.size = 0
 
@@ -23,24 +23,40 @@ def enqueue(self, element):
             In the store are occupied
             returns None
         """
-        pass
+        if self.size == self.buffer_size:
+            raise QueueFullException()
+
+
+        self.rear = (self.rear + 1) % self.buffer_size
+        self.store[self.rear] = element
+        self.size += 1
+
 
     def dequeue(self):
         """ Removes and returns an element from the Queue
             Raises a QueueEmptyException if 
             The Queue is empty.
         """
-        pass
+        if self.size == 0:
+            raise QueueEmptyException()
+
+        return_value = self.store[self.front]
+        self.store[self.front] = None
+        self.front += 1
+        self.size -= 1
+        return return_value
+
 
-    def front(self):
+    def get_front(self):
         """ Returns an element from the front
             of the Queue and None if the Queue
             is empty.  Does not remove anything.
         """
+
         pass
 
 
-    def size(self):
+    def find_size(self):
         """ Returns the number of elements in
             The Queue
         """
@@ -50,12 +66,24 @@ def empty(self):
         """ Returns True if the Queue is empty
             And False otherwise.
         """
-        pass
+        if self.size <= 0:
+            return True
+        return False
 
     def __str__(self):
         """ 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.rear < self.front:
+            items_str = ", ".join(str(self.store[item]) for item in range(self.front, self.size - 1))
+            second_set_items = ", ".join(str(self.store[item]) for item in range(-1, self.rear + 1))
+            joined_items = "[" + items_str + ", " + second_set_items + "]"
+            return joined_items
+
+        else:
+            items_str = ", ".join(str(self.store[item]) for item in range(self.front, self.rear + 1))
+            joined_items = "[" + items_str + "]"
+            return joined_items

stacks_queues/stack.py

@@ -12,7 +12,8 @@ def push(self, element):
         """ Adds an element to the top of the Stack.
             Returns None
         """
-        pass
+        self.store.add_first(element)
+
 
     def pop(self):
         """ Removes an element from the top
@@ -21,18 +22,21 @@ def pop(self):
             The Stack is empty.
             returns None
         """
-        pass
+        if self.store.empty():
+            raise StackEmptyException()
+        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 self.store.str()