Alie Ibarra C16

stacks_queues/queue.py

@@ -15,47 +15,43 @@ 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 len(self.store) == self.size:
+            raise QueueFullException("QUEUE IS FULL")
+
+        self.store[self.rear] = element
+        self.size += 1
+        self.rear = (self.rear+1)% self.buffer_size
+
 
     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("QUEUE IS EMPTY")
+
+        element = self.store[self.front]
+        self.size -= 1
+        self.store[self.front] = None
+        self.front = (self.front +1) % self.buffer_size
+        return element
 
     def front(self):
-        """ Returns an element from the front
-            of the Queue and None if the Queue
-            is empty.  Does not remove anything.
-        """
-        pass
-
+        if self.size > 0:
+            return self.store[self.front]
 
     def size(self):
-        """ Returns the number of elements in
-            The Queue
-        """
-        pass
+        return self.size
 
     def empty(self):
-        """ Returns True if the Queue is empty
-            And False otherwise.
-        """
-        pass
+        return self.size == 0
 
     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
+        q = []
+        start = self.front
+        while len(q) < self.size:
+            q.append(self.store[start])
+            if start < len(self.store) - 1:
+                start += 1
+            else:
+                start = 0
+        return str(q)

stacks_queues/stack.py

@@ -9,30 +9,13 @@ def __init__(self):
         self.store = LinkedList()
 
     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
-            Of the Stack
-            Raises a StackEmptyException if
-            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())