diff --git a/DataStructures/Queues/GenericArrayListQueue.java b/DataStructures/Queues/GenericArrayListQueue.java index cc37ab02..9bd7e560 100644 --- a/DataStructures/Queues/GenericArrayListQueue.java +++ b/DataStructures/Queues/GenericArrayListQueue.java @@ -5,17 +5,17 @@ import java.util.ArrayList; /** * This class implements a GenericArrayListQueue. * - *

A GenericArrayListQueue data structure functions the same as any specific-typed queue. The - * GenericArrayListQueue holds elemets of types to-be-specified at runtime. The elements that are - * added first are the first to be removed (FIFO) New elements are added to the back/rear of the + * A GenericArrayListQueue data structure functions the same as any specific-typed queue. The + * GenericArrayListQueue holds elements of types to-be-specified at runtime. The elements that are + * added first are the first to be removed (FIFO). New elements are added to the back/rear of the * queue. */ public class GenericArrayListQueue { /** The generic ArrayList for the queue T is the generic element */ - ArrayList _queue = new ArrayList(); + ArrayList _queue = new ArrayList<>(); /** - * Checks if the queue has elements (not empty) + * Checks if the queue has elements (not empty). * * @return True if the queue has elements. False otherwise. */ @@ -24,7 +24,7 @@ public class GenericArrayListQueue { } /** - * Checks what's at the front of the queue + * Checks what's at the front of the queue. * * @return If queue is not empty, element at the front of the queue. Otherwise, null */ @@ -51,7 +51,7 @@ public class GenericArrayListQueue { * * @return If queue is not empty, element retrieved. Otherwise, null */ - public T poll() { + public T pull() { T result = null; if (this.hasElements()) { result = _queue.remove(0); @@ -65,19 +65,19 @@ public class GenericArrayListQueue { * @param args Command line arguments */ public static void main(String[] args) { - GenericArrayListQueue queue = new GenericArrayListQueue(); + GenericArrayListQueue queue = new GenericArrayListQueue<>(); System.out.println("Running..."); assert queue.peek() == null; - assert queue.poll() == null; - assert queue.add(1) == true; + assert queue.pull() == null; + assert queue.add(1); assert queue.peek() == 1; - assert queue.add(2) == true; + assert queue.add(2); assert queue.peek() == 1; - assert queue.poll() == 1; + assert queue.pull() == 1; assert queue.peek() == 2; - assert queue.poll() == 2; + assert queue.pull() == 2; assert queue.peek() == null; - assert queue.poll() == null; + assert queue.pull() == null; System.out.println("Finished."); } } diff --git a/DataStructures/Queues/LinkedQueue.java b/DataStructures/Queues/LinkedQueue.java index b60cc4b4..e3d693f5 100644 --- a/DataStructures/Queues/LinkedQueue.java +++ b/DataStructures/Queues/LinkedQueue.java @@ -38,7 +38,7 @@ public class LinkedQueue { /** * Check if queue is empty * - * @return true if queue is empty, otherwise false + * @return true if queue is empty, otherwise false */ public boolean isEmpty() { return size == 0; @@ -48,7 +48,7 @@ public class LinkedQueue { * Add element to rear of queue * * @param data insert value - * @return true if add successfully + * @return true if add successfully */ public boolean enqueue(int data) { Node newNode = new Node(data); diff --git a/DataStructures/Queues/Queues.java b/DataStructures/Queues/Queues.java index 6bd5bdc4..52d8510a 100644 --- a/DataStructures/Queues/Queues.java +++ b/DataStructures/Queues/Queues.java @@ -3,7 +3,7 @@ package DataStructures.Queues; /** * This implements Queues by using the class Queue. * - *

A queue data structure functions the same as a real world queue. The elements that are added + * A queue data structure functions the same as a real world queue. The elements that are added * first are the first to be removed. New elements are added to the back/rear of the queue. */ class Queue { @@ -153,7 +153,7 @@ public class Queues { myQueue.remove(); // Will make 2 the new front, making 10 no longer part of the queue // [10, 2(front), 5, 3(rear)] - myQueue.insert(7); // Insert 7 at the rear which will be index 0 because of wrap around + myQueue.insert(7); // Insert 7 at the rear which will get 0 index because of wrap around // [7(rear), 2(front), 5, 3] System.out.println(myQueue.peekFront()); // Will print 2