From 545055ce3d118f3230bbe2648ba7d1278a5ef784 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:03:51 +0200 Subject: [PATCH 01/19] 1. dodanie pliku gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..51f0214f --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.DS_Store +.idea/ +target/ +bin/ From 201eee6165d3e2205551c781edd781b463b95ee4 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:08:18 +0200 Subject: [PATCH 02/19] 2. Poprawa formatowania klasy HanoiRhymer --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 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..d611042b 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,17 +1,16 @@ package edu.kis.vh.nursery; 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); + else + super.countIn(in); } } From 882a3af590df7ccbcdc6a2db89aadd67d4c04d45 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:22:38 +0200 Subject: [PATCH 03/19] 2. Dodanie pustej linii dla formatowania pliku HanoiRhymer --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index d611042b..ec0691fc 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,7 @@ package edu.kis.vh.nursery; public class HanoiRhymer extends defaultCountingOutRhymer { + int totalRejected = 0; public int reportRejected() { From 8f29fabf2ba55468ac72f6fb49f960646ff8d620 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:23:49 +0200 Subject: [PATCH 04/19] 3. Scalenie z galezia format --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 14 +++---- .../vh/nursery/defaultCountingOutRhymer.java | 38 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 22 +++++------ .../java/edu/kis/vh/nursery/list/Node.java | 2 +- 4 files changed, 37 insertions(+), 39 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..13f788eb 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -3,19 +3,17 @@ public class FIFORhymer extends defaultCountingOutRhymer { public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); - + @Override public int countOut() { while (!callCheck()) - - temp.countIn(super.countOut()); - + temp.countIn(super.countOut()); + int ret = temp.countOut(); - + while (!temp.callCheck()) - - countIn(temp.countOut()); - + countIn(temp.countOut()); + return ret; } } diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 199abf6d..89033a01 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -11,24 +11,24 @@ public void countIn(int in) { NUMBERS[++total] = in; } - public boolean callCheck() { - return total == -1; - } - - public boolean isFull() { - return total == 11; - } - - protected int peekaboo() { - if (callCheck()) - return -1; - return NUMBERS[total]; - } - - public int countOut() { - if (callCheck()) - return -1; - return NUMBERS[total--]; - } + public boolean callCheck() { + return total == -1; + } + + public boolean isFull() { + return total == 11; + } + + protected int peekaboo() { + if (callCheck()) + return -1; + return NUMBERS[total]; + } + + public int countOut() { + if (callCheck()) + return -1; + return NUMBERS[total--]; + } } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index 033755d0..b480c321 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -2,14 +2,14 @@ import edu.kis.vh.nursery.defaultCountingOutRhymer; - public interface Rhymersfactory { - - public defaultCountingOutRhymer GetStandardRhymer(); - - public defaultCountingOutRhymer GetFalseRhymer(); - - public defaultCountingOutRhymer GetFIFORhymer(); - - public defaultCountingOutRhymer GetHanoiRhymer(); - - } +public interface Rhymersfactory { + + public defaultCountingOutRhymer GetStandardRhymer(); + + public defaultCountingOutRhymer GetFalseRhymer(); + + public defaultCountingOutRhymer GetFIFORhymer(); + + public defaultCountingOutRhymer GetHanoiRhymer(); + +} 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..1704f3ce 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -8,5 +8,5 @@ public class Node { public Node(int i) { value = i; } - + } From 0f740e141f5e837dd27940c3dc4b7e5feff69d2e Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:41:13 +0200 Subject: [PATCH 05/19] 5. poprawa konwencji nazewniczej w nazwach pol klas --- .../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 89033a01..3659f378 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,13 +2,13 @@ public class defaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; + private int[] numbers = new int[12]; public int total = -1; public void countIn(int in) { if (!isFull()) - NUMBERS[++total] = in; + numbers[++total] = in; } public boolean callCheck() { @@ -22,13 +22,13 @@ public boolean isFull() { protected int peekaboo() { if (callCheck()) return -1; - return NUMBERS[total]; + return numbers[total]; } public int countOut() { if (callCheck()) return -1; - return NUMBERS[total--]; + return numbers[total--]; } } From 984cc7a7c1270e63514f3a4053d6ba5573d55290 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:34:26 +0200 Subject: [PATCH 06/19] 4.1 poprawa nazw klas --- ...tRhymer.java => DefaultCountingOutRhymer.java} | 2 +- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../vh/nursery/factory/DefaultRhymersFactory.java | 15 +++++++-------- .../kis/vh/nursery/factory/Rhymersfactory.java | 10 +++++----- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 +--- .../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 7 files changed, 22 insertions(+), 25 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (93%) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java similarity index 93% rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java rename to src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 3659f378..0c7e4e71 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class defaultCountingOutRhymer { +public class DefaultCountingOutRhymer { private int[] numbers = new int[12]; diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 13f788eb..3cea0867 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -1,8 +1,8 @@ package edu.kis.vh.nursery; -public class FIFORhymer extends defaultCountingOutRhymer { +public class FIFORhymer extends DefaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index ec0691fc..89ffa912 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { +public class HanoiRhymer extends DefaultCountingOutRhymer { int totalRejected = 0; diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 60ba2a16..9f3a9638 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -1,29 +1,28 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; import edu.kis.vh.nursery.FIFORhymer; import edu.kis.vh.nursery.HanoiRhymer; -import edu.kis.vh.nursery.factory.Rhymersfactory; public class DefaultRhymersFactory implements Rhymersfactory { @Override - public defaultCountingOutRhymer GetStandardRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFalseRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFIFORhymer() { + public DefaultCountingOutRhymer GetFIFORhymer() { return new FIFORhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer GetHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index b480c321..ded94a97 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -1,15 +1,15 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; public interface Rhymersfactory { - public defaultCountingOutRhymer GetStandardRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer(); - public defaultCountingOutRhymer GetFalseRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer(); - public defaultCountingOutRhymer GetFIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer(); - public defaultCountingOutRhymer GetHanoiRhymer(); + public DefaultCountingOutRhymer GetHanoiRhymer(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 05aba9fa..a1f89c7f 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,7 +1,5 @@ package edu.kis.vh.nursery; -import edu.kis.vh.nursery.defaultCountingOutRhymer; -import edu.kis.vh.nursery.HanoiRhymer; import edu.kis.vh.nursery.factory.DefaultRhymersFactory; import edu.kis.vh.nursery.factory.Rhymersfactory; @@ -10,7 +8,7 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), + DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; for (int i = 1; i < 15; i++) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index 144906eb..f0f88d99 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -7,7 +7,7 @@ public class RhymersJUnitTest { @Test public void testCountIn() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); int testValue = 4; rhymer.countIn(testValue); @@ -17,7 +17,7 @@ public void testCountIn() { @Test public void testCallCheck() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); boolean result = rhymer.callCheck(); Assert.assertEquals(true, result); @@ -29,7 +29,7 @@ public void testCallCheck() { @Test public void testIsFull() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int STACK_CAPACITY = 12; for (int i = 0; i < STACK_CAPACITY; i++) { boolean result = rhymer.isFull(); @@ -43,7 +43,7 @@ public void testIsFull() { @Test public void testPeekaboo() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.peekaboo(); @@ -60,7 +60,7 @@ public void testPeekaboo() { @Test public void testCountOut() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.countOut(); From 8cf84a16246b5668845eaa236b8d524553493f9f Mon Sep 17 00:00:00 2001 From: matmirowski Date: Wed, 10 Apr 2024 12:38:15 +0200 Subject: [PATCH 07/19] 4.2 zmiana konwencji nazewniczej metod --- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 8 ++++---- .../java/edu/kis/vh/nursery/factory/Rhymersfactory.java | 8 ++++---- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 9f3a9638..1387fa70 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -7,22 +7,22 @@ public class DefaultRhymersFactory implements Rhymersfactory { @Override - public DefaultCountingOutRhymer GetStandardRhymer() { + public DefaultCountingOutRhymer getStandardRhymer() { return new DefaultCountingOutRhymer(); } @Override - public DefaultCountingOutRhymer GetFalseRhymer() { + public DefaultCountingOutRhymer getFalseRhymer() { return new DefaultCountingOutRhymer(); } @Override - public DefaultCountingOutRhymer GetFIFORhymer() { + public DefaultCountingOutRhymer getFIFORhymer() { return new FIFORhymer(); } @Override - public DefaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer getHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index ded94a97..da726cf0 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -4,12 +4,12 @@ public interface Rhymersfactory { - public DefaultCountingOutRhymer GetStandardRhymer(); + public DefaultCountingOutRhymer getStandardRhymer(); - public DefaultCountingOutRhymer GetFalseRhymer(); + public DefaultCountingOutRhymer getFalseRhymer(); - public DefaultCountingOutRhymer GetFIFORhymer(); + public DefaultCountingOutRhymer getFIFORhymer(); - public DefaultCountingOutRhymer GetHanoiRhymer(); + public DefaultCountingOutRhymer getHanoiRhymer(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index a1f89c7f..b854e2ee 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -8,8 +8,8 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), - factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; + DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(), + factory.getFIFORhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) From 6b59f6557070de932a8a90f20b3fc629bee4f07a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:11:52 +0200 Subject: [PATCH 08/19] 6. zastapienie literalow stalymi --- .../vh/nursery/DefaultCountingOutRhymer.java | 18 ++++++++++++------ .../java/edu/kis/vh/nursery/HanoiRhymer.java | 3 ++- .../edu/kis/vh/nursery/list/IntLinkedList.java | 5 +++-- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 0c7e4e71..efeee429 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,9 +2,15 @@ public class DefaultCountingOutRhymer { - private int[] numbers = new int[12]; + private static final int MAX = 11; - public int total = -1; + private static final int ERROR = -1; + + private static final int SIZE = 12; + + private int[] numbers = new int[SIZE]; + + public int total = ERROR; public void countIn(int in) { if (!isFull()) @@ -12,22 +18,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == ERROR; } public boolean isFull() { - return total == 11; + return total == MAX; } protected int peekaboo() { if (callCheck()) - return -1; + return ERROR; return numbers[total]; } public int countOut() { if (callCheck()) - return -1; + return ERROR; return numbers[total--]; } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 89ffa912..50a1c64f 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,7 +2,8 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { - int totalRejected = 0; + private static final int START = 0; + int totalRejected = START; public int reportRejected() { return totalRejected; 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..a95ccf09 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,7 @@ public class IntLinkedList { + private static final int ERROR = -1; Node last; int i; @@ -25,13 +26,13 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; + return ERROR; return last.value; } public int pop() { if (isEmpty()) - return -1; + return ERROR; int ret = last.value; last = last.prev; return ret; From 66fea57a3929e54eb8151d08dc7c22bea819f269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:14:37 +0200 Subject: [PATCH 09/19] 7. ustawienie final przy niemutowalnych atrybutach --- src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index efeee429..8844baf3 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -8,7 +8,7 @@ public class DefaultCountingOutRhymer { private static final int SIZE = 12; - private int[] numbers = new int[SIZE]; + private final int[] numbers = new int[SIZE]; public int total = ERROR; From a588e9991118d7e80ee08c34b49330fee4be1085 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:17:31 +0200 Subject: [PATCH 10/19] 8. adnotacja override --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 50a1c64f..d5807a96 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -8,7 +8,8 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { public int reportRejected() { return totalRejected; } - + + @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; From cde2b59b40b8f091bd1bffe4da15887b64d82170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:45:20 +0200 Subject: [PATCH 11/19] =?UTF-8?q?Zmienna=20value=20w=20pliku=20Node=20powi?= =?UTF-8?q?nna=20by=C4=87=20final.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/list/Node.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1704f3ce..a77f7d52 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 ccadcdc9ae5afde4d9f01ac26aa2e13f4f478346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:46:11 +0200 Subject: [PATCH 12/19] =?UTF-8?q?Zmienna=20temp=20w=20pliku=20FIFORhymer?= =?UTF-8?q?=20powinna=20by=C4=87=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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 3cea0867..a598edf1 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() { From 901df2b0626de91a69378a61b5dbc38df6298fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:46:55 +0200 Subject: [PATCH 13/19] =?UTF-8?q?Zmienna=20za=20ma=C5=82o=20m=C3=B3wi=20o?= =?UTF-8?q?=20swoim=20przeznaczeniu,=20mo=C5=BCna=20zmieni=C4=87=20na=20np?= =?UTF-8?q?.=20MAX=5FSIZE.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 8844baf3..06e9ded4 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -6,9 +6,9 @@ public class DefaultCountingOutRhymer { private static final int ERROR = -1; - private static final int SIZE = 12; + private static final int MAX_SIZE = 12; - private final int[] numbers = new int[SIZE]; + private final int[] numbers = new int[MAX_SIZE]; public int total = ERROR; From 268fb2a81031b8d64903d069754871290dc34e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:48:19 +0200 Subject: [PATCH 14/19] Niepowiazane dane. --- src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 06e9ded4..99ac0a32 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -6,7 +6,7 @@ public class DefaultCountingOutRhymer { private static final int ERROR = -1; - private static final int MAX_SIZE = 12; + private static final int MAX_SIZE = MAX + 1; private final int[] numbers = new int[MAX_SIZE]; From 43b0731b6a674904f96c02810916c3edaaacb0d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kacper=20Wo=C5=BAnica?= Date: Tue, 21 May 2024 21:49:58 +0200 Subject: [PATCH 15/19] =?UTF-8?q?Zmienne=20w=20peekaboo=20i=20countOut=20n?= =?UTF-8?q?ie=20s=C4=85=20ze=20sob=C4=85=20powi=C4=85zane,=20utw=C3=B3rz?= =?UTF-8?q?=20osobne=20zmienne.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 99ac0a32..ebdb103a 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -4,13 +4,15 @@ public class DefaultCountingOutRhymer { private static final int MAX = 11; + private static final int DEFAULT_VALUE = -1; + private static final int ERROR = -1; private static final int MAX_SIZE = MAX + 1; private final int[] numbers = new int[MAX_SIZE]; - public int total = ERROR; + public int total = DEFAULT_VALUE; public void countIn(int in) { if (!isFull()) @@ -18,7 +20,7 @@ public void countIn(int in) { } public boolean callCheck() { - return total == ERROR; + return total == DEFAULT_VALUE; } public boolean isFull() { From 81ad7f183cb943cac7ef35cd5c001f1cea632f63 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Sun, 26 May 2024 20:24:28 +0200 Subject: [PATCH 16/19] 9. Zastosowanie mozliwie najmniejszej widocznosci atrybutow klas --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index ebdb103a..13d3f0d8 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -12,7 +12,7 @@ public class DefaultCountingOutRhymer { private final int[] numbers = new int[MAX_SIZE]; - public int total = DEFAULT_VALUE; + private int total = DEFAULT_VALUE; public void countIn(int in) { if (!isFull()) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index a598edf1..e49c379c 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 final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + private final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index d5807a96..b5434b00 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -3,7 +3,7 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { private static final int START = 0; - int totalRejected = START; + private int totalRejected = START; public int reportRejected() { return totalRejected; 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 a95ccf09..0dbd838b 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -3,8 +3,8 @@ public class IntLinkedList { private static final int ERROR = -1; - Node last; - int i; + private Node last; + private int i; public void push(int i) { if (last == null) From 3cbf6c426aade2ad1ac066d74d4073b686cf63a9 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Sun, 26 May 2024 20:26:40 +0200 Subject: [PATCH 17/19] 10. Dodanie gettera dla pola total w klasie DefaultCountingOutRhymer --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 13d3f0d8..4687a627 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -14,6 +14,10 @@ public class DefaultCountingOutRhymer { private int total = DEFAULT_VALUE; + public int getTotal() { + return total; + } + public void countIn(int in) { if (!isFull()) numbers[++total] = in; From 3338d82be2318858a04eb401c09bcbf707eb557d Mon Sep 17 00:00:00 2001 From: matmirowski Date: Sun, 26 May 2024 20:32:38 +0200 Subject: [PATCH 18/19] 11. Hermetyzacja nieprywatnych atrybutow --- .../kis/vh/nursery/list/IntLinkedList.java | 17 +++++----- .../java/edu/kis/vh/nursery/list/Node.java | 33 ++++++++++++++++--- 2 files changed, 36 insertions(+), 14 deletions(-) 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 0dbd838b..4f819e5c 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -10,9 +10,9 @@ public void push(int i) { if (last == null) last = new Node(i); else { - last.next = new Node(i); - last.next.prev = last; - last = last.next; + last.setNext(new Node(i)); + last.getNext().setPrev(last); + last = last.getNext(); } } @@ -26,16 +26,15 @@ public boolean isFull() { public int top() { if (isEmpty()) - return ERROR; - return last.value; + return -1; + return last.getValue(); } public int pop() { if (isEmpty()) - return ERROR; - int ret = last.value; - last = last.prev; + return -1; + int ret = last.getValue(); + last = last.getPrev(); return ret; } - } 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 a77f7d52..5549a78b 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -1,12 +1,35 @@ package edu.kis.vh.nursery.list; public class Node { - - public final int value; - public Node prev, next; + private int value; + private Node prev; + private Node next; public Node(int i) { - value = i; + setValue(i); + } + + public int getValue() { + return value; + } + + public void setValue(int value) { + this.value = value; + } + + public Node getPrev() { + return prev; + } + + public void setPrev(Node prev) { + this.prev = prev; } -} + public Node getNext() { + return next; + } + + public void setNext(Node next) { + this.next = next; + } +} \ No newline at end of file From a304bae6e02c5325ceb8d5dd4f792912476b2704 Mon Sep 17 00:00:00 2001 From: matmirowski Date: Sun, 26 May 2024 20:35:38 +0200 Subject: [PATCH 19/19] 12. Usuniecie nieuzywanego gettera --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 4687a627..13d3f0d8 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -14,10 +14,6 @@ public class DefaultCountingOutRhymer { private int total = DEFAULT_VALUE; - public int getTotal() { - return total; - } - public void countIn(int in) { if (!isFull()) numbers[++total] = in;