From a1019d415b21ae099ba53f9eec62a0726e60a290 Mon Sep 17 00:00:00 2001 From: PaddyKe <34421580+PaddyKe@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:05:39 +0200 Subject: [PATCH 1/5] implemented a stack in java --- .../stacks_and_queues/code/java/Stack.java | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 contents/stacks_and_queues/code/java/Stack.java diff --git a/contents/stacks_and_queues/code/java/Stack.java b/contents/stacks_and_queues/code/java/Stack.java new file mode 100644 index 000000000..5489a03a7 --- /dev/null +++ b/contents/stacks_and_queues/code/java/Stack.java @@ -0,0 +1,72 @@ +import java.util.List; +import java.util.ArrayList; + + +public class StackTest { + + public static void main(String[] args) { + IStack intStack = new Stack<>(); + + intStack.push(4); + intStack.push(5); + intStack.push(9); + + System.out.println(intStack.pop()); + System.out.println(intStack.size()); + System.out.println(intStack.peek()); + } + +} + + +interface IStack { + /* + * 'pop' removed the last element from the stack and returns it + */ + T pop(); + + /* + * 'push' adds an element to at the end of the stack and returns the new size + */ + int push(T element); + + /* + * 'size' returns the length of the stack + */ + int size(); + + /* + * 'peek' returns the first element of the stack + */ + T peek(); +} + + +public class Stack implements IStack { + + private List list; + + public Stack() { + this.list = new ArrayList<>(); + } + + public T pop() { + return this.list.remove(this.size() - 1); + } + + public int push(T element) { + this.list.add(element); + return this.size(); + } + + public int size() { + return this.list.size(); + } + + public T peek() { + return this.list.get(this.size() - 1); + } + +} + + From b073969954a978e5c284b038c411c95dcc34f9fb Mon Sep 17 00:00:00 2001 From: PaddyKe <34421580+PaddyKe@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:20:20 +0200 Subject: [PATCH 2/5] Implemented queue in java --- .../stacks_and_queues/code/java/Queue.java | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 contents/stacks_and_queues/code/java/Queue.java diff --git a/contents/stacks_and_queues/code/java/Queue.java b/contents/stacks_and_queues/code/java/Queue.java new file mode 100644 index 000000000..b61721b24 --- /dev/null +++ b/contents/stacks_and_queues/code/java/Queue.java @@ -0,0 +1,71 @@ +import java.util.List; +import java.util.ArrayList; + +public class QueueTest { + + public static void main(String[] args) { + IQueue intQueue = new Queue<>(); + + intQueue.enqueue(4); + intQueue.enqueue(5); + intQueue.enqueue(9); + + System.out.println(intQueue.dequeue()); + System.out.println(intQueue.size()); + System.out.println(intQueue.peek()); + } + +} + + +interface IQueue { + + /* + * 'dequeue' removes the first element from the queue and returns it + */ + T dequeue(); + + /* + * 'enqueue' adds an element at the end of the queue and returns the new size + */ + int enqueue(T element); + + + /* + * 'size' returns the size of the queue + */ + int size(); + + /* + * 'peek' returns the first element of the queue without removing it + */ + T peek(); +} + + +public class Queue implements IQueue { + + private List list; + + public Queue() { + this.list = new ArrayList(); + } + + public T dequeue() { + return this.list.remove(0); + } + + public int enqueue(T element) { + this.list.add(element); + return this.size(); + } + + public int size() { + return this.list.size(); + } + + public T peek() { + return this.list.get(0); + } + +} From 9476cdf0a227c588d2ed3eee494ac1e188cb01f5 Mon Sep 17 00:00:00 2001 From: PaddyKe <34421580+PaddyKe@users.noreply.github.com> Date: Thu, 21 Oct 2021 18:24:06 +0200 Subject: [PATCH 3/5] ajusted the markdown file --- contents/stacks_and_queues/stacks_and_queues.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contents/stacks_and_queues/stacks_and_queues.md b/contents/stacks_and_queues/stacks_and_queues.md index 11c7088f7..89a77be9a 100644 --- a/contents/stacks_and_queues/stacks_and_queues.md +++ b/contents/stacks_and_queues/stacks_and_queues.md @@ -18,12 +18,16 @@ Here is a simple implementation of a stack: {% method %} {% sample lang="ts" %} [import, lang:"typescript"](code/typescript/stack.ts) +{% sample lang="java" %} +[import, lang:"java"](code/java/Stack.java) {% endmethod %} Here is a simple implementation of a queue: {% method %} {% sample lang="ts" %} [import, lang:"typescript"](code/typescript/queue.ts) +{% sample lang="java" %} +[import, lang:"java" ](code/java/Queue.java) {% endmethod %} From 6fc27e29dcf321e9d9463f746bc98a3db28ca438 Mon Sep 17 00:00:00 2001 From: PaddyKe <34421580+PaddyKe@users.noreply.github.com> Date: Fri, 22 Oct 2021 21:20:45 +0200 Subject: [PATCH 4/5] removed tabs with spaces --- contents/stacks_and_queues/code/java/Queue.java | 12 ++++++------ contents/stacks_and_queues/code/java/Stack.java | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contents/stacks_and_queues/code/java/Queue.java b/contents/stacks_and_queues/code/java/Queue.java index b61721b24..7e38d6e82 100644 --- a/contents/stacks_and_queues/code/java/Queue.java +++ b/contents/stacks_and_queues/code/java/Queue.java @@ -48,24 +48,24 @@ public class Queue implements IQueue { private List list; public Queue() { - this.list = new ArrayList(); + this.list = new ArrayList(); } public T dequeue() { - return this.list.remove(0); + return this.list.remove(0); } public int enqueue(T element) { - this.list.add(element); - return this.size(); + this.list.add(element); + return this.size(); } public int size() { - return this.list.size(); + return this.list.size(); } public T peek() { - return this.list.get(0); + return this.list.get(0); } } diff --git a/contents/stacks_and_queues/code/java/Stack.java b/contents/stacks_and_queues/code/java/Stack.java index 5489a03a7..b86252509 100644 --- a/contents/stacks_and_queues/code/java/Stack.java +++ b/contents/stacks_and_queues/code/java/Stack.java @@ -47,24 +47,24 @@ public class Stack implements IStack { private List list; public Stack() { - this.list = new ArrayList<>(); + this.list = new ArrayList<>(); } public T pop() { - return this.list.remove(this.size() - 1); + return this.list.remove(this.size() - 1); } public int push(T element) { - this.list.add(element); - return this.size(); + this.list.add(element); + return this.size(); } public int size() { - return this.list.size(); + return this.list.size(); } public T peek() { - return this.list.get(this.size() - 1); + return this.list.get(this.size() - 1); } } From dd70883cc2de02a2e374dfa8a0145eab87b4e860 Mon Sep 17 00:00:00 2001 From: PaddyKe <34421580+PaddyKe@users.noreply.github.com> Date: Sat, 23 Oct 2021 13:45:19 +0200 Subject: [PATCH 5/5] matched the naming convention to the chapter --- contents/stacks_and_queues/code/java/Queue.java | 10 +++++----- contents/stacks_and_queues/code/java/Stack.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/contents/stacks_and_queues/code/java/Queue.java b/contents/stacks_and_queues/code/java/Queue.java index 7e38d6e82..bb349ec6d 100644 --- a/contents/stacks_and_queues/code/java/Queue.java +++ b/contents/stacks_and_queues/code/java/Queue.java @@ -12,7 +12,7 @@ public static void main(String[] args) { System.out.println(intQueue.dequeue()); System.out.println(intQueue.size()); - System.out.println(intQueue.peek()); + System.out.println(intQueue.front()); } } @@ -37,9 +37,9 @@ interface IQueue { int size(); /* - * 'peek' returns the first element of the queue without removing it + * 'front' returns the first element of the queue without removing it */ - T peek(); + T front(); } @@ -48,7 +48,7 @@ public class Queue implements IQueue { private List list; public Queue() { - this.list = new ArrayList(); + this.list = new ArrayList<>(); } public T dequeue() { @@ -64,7 +64,7 @@ public int size() { return this.list.size(); } - public T peek() { + public T front() { return this.list.get(0); } diff --git a/contents/stacks_and_queues/code/java/Stack.java b/contents/stacks_and_queues/code/java/Stack.java index b86252509..2d65a0e59 100644 --- a/contents/stacks_and_queues/code/java/Stack.java +++ b/contents/stacks_and_queues/code/java/Stack.java @@ -13,7 +13,7 @@ public static void main(String[] args) { System.out.println(intStack.pop()); System.out.println(intStack.size()); - System.out.println(intStack.peek()); + System.out.println(intStack.top()); } } @@ -36,9 +36,9 @@ interface IStack { int size(); /* - * 'peek' returns the first element of the stack + * 'top' returns the first element of the stack */ - T peek(); + T top(); } @@ -63,7 +63,7 @@ public int size() { return this.list.size(); } - public T peek() { + public T top() { return this.list.get(this.size() - 1); }