From c3d6e990d2f2d209a40d980a1277e4004c6017a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Boru=C5=84?= <245777@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:15:09 +0200 Subject: [PATCH 1/6] 1. dodanie pliku gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c875fbdc --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.idea/ +bin/ From 6d98607d47a37693ab76f19c757a9fff2e6d8440 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Boru=C5=84?= <245777@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:21:54 +0200 Subject: [PATCH 2/6] 2. dodanie pliku gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c875fbdc..0b0490d3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .idea/ bin/ +target/ From 6913c353897b529f2868f48934e3a23f6cf688b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Boru=C5=84?= <245777@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:38:11 +0200 Subject: [PATCH 3/6] 3. Sformatowano HanoiRhymer --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 755b2d58..87de9684 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,14 +2,14 @@ public class HanoiRhymer extends defaultCountingOutRhymer { -int totalRejected = 0; + int totalRejected = 0; public int reportRejected() { return totalRejected; } public void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!callCheck() && in > peekaboo()) totalRejected++; else super.countIn(in); From c396abf1015148dba1858a335be0a958a82d4882 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Mon, 20 May 2024 16:23:55 +0200 Subject: [PATCH 4/6] =?UTF-8?q?6.Dodanie=20zmiennych=20zamiast=20litera?= =?UTF-8?q?=C5=82=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/defaultCountingOutRhymer.java | 15 +++++++++------ .../edu/kis/vh/nursery/list/IntLinkedList.java | 6 ++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 199abf6d..7a1bccc4 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,9 +2,12 @@ public class defaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; + public static final int EMPTY = -1; + public static final int CAPACITY = 12; + public static final int FULL = CAPACITY-1; + private int[] NUMBERS = new int[CAPACITY]; - public int total = -1; + public int total = EMPTY; public void countIn(int in) { if (!isFull()) @@ -12,22 +15,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == EMPTY; } public boolean isFull() { - return total == 11; + return total == FULL; } protected int peekaboo() { if (callCheck()) - return -1; + return EMPTY;; return NUMBERS[total]; } public int countOut() { if (callCheck()) - return -1; + return EMPTY; return NUMBERS[total--]; } diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 07efc0a2..60f1efb0 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,6 +2,8 @@ public class IntLinkedList { + public static final int EMPTY = -1; + Node last; int i; @@ -25,13 +27,13 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; + return EMPTY; return last.value; } public int pop() { if (isEmpty()) - return -1; + return EMPTY; int ret = last.value; last = last.prev; return ret; From 37056492fcbbf5c4c3bf6f8513721d47680c8fa2 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Mon, 20 May 2024 16:34:18 +0200 Subject: [PATCH 5/6] =?UTF-8?q?7.Dodanie=20modyfikator=C3=B3w=20final?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/list/Node.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 28591ada..0679cb50 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,7 +2,7 @@ public class FIFORhymer extends defaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public final defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 7a1bccc4..1727b323 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -5,7 +5,7 @@ public class defaultCountingOutRhymer { public static final int EMPTY = -1; public static final int CAPACITY = 12; public static final int FULL = CAPACITY-1; - private int[] NUMBERS = new int[CAPACITY]; + private final int[] NUMBERS = new int[CAPACITY]; public int total = EMPTY; diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java index 0a2cd75e..abd6bc5c 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -2,7 +2,7 @@ public class Node { - public int value; + public final int value; public Node prev, next; public Node(int i) { From b6bba01c9e6376450547ce4809b17f3ea49fa0e5 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Mon, 20 May 2024 16:36:41 +0200 Subject: [PATCH 6/6] 8. Dodanie adnotacji override --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 87de9684..8a8961e9 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -8,6 +8,7 @@ public int reportRejected() { return totalRejected; } + @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 1727b323..614e0dcf 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -9,6 +9,7 @@ public class defaultCountingOutRhymer { public int total = EMPTY; + public void countIn(int in) { if (!isFull()) NUMBERS[++total] = in;