From e3c443c6efe86b57db264fc488aba526ae7be547 Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 8 Apr 2024 13:44:53 +0200 Subject: [PATCH 01/15] 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..2d513a01 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/.idea/ +/target/ From fef1809bcaa220d736a8affa93f0c94e0ec1b58e Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 12:46:44 +0200 Subject: [PATCH 02/15] 2. Formatownie kodu --- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 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..d2e30d47 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -4,14 +4,14 @@ public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; - public int reportRejected() { - return totalRejected; - } +public int reportRejected() { + return totalRejected; +} - public void countIn(int in) { - if (!callCheck() && in > peekaboo()) - totalRejected++; - else - super.countIn(in); - } +public void countIn(int in) { +if (!callCheck() && in > peekaboo()) + totalRejected++; + else + super.countIn(in); +} } From 4ebdf40b13d6522e3d5bb4894ae6ae5c39dd45a5 Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 13:15:40 +0200 Subject: [PATCH 03/15] 3.Poprawione formatowanie --- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index d2e30d47..ffd60ecb 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,16 +2,16 @@ public class HanoiRhymer extends defaultCountingOutRhymer { -int totalRejected = 0; + int totalRejected = 0; -public int reportRejected() { - return totalRejected; -} + public int reportRejected() { + return totalRejected; + } -public void countIn(int in) { -if (!callCheck() && in > peekaboo()) - totalRejected++; - else - super.countIn(in); -} + public void countIn(int in) { + if (!callCheck() && in > peekaboo()) + totalRejected++; + else + super.countIn(in); + } } From ce304c709aad63db8e110bfc026c739ae10a2a2e Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 13:18:37 +0200 Subject: [PATCH 04/15] 4. Poprawienie formatowania kodu --- 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 ffd60ecb..7d324d00 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -11,7 +11,7 @@ public int reportRejected() { public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; - else - super.countIn(in); + else + super.countIn(in); } } From ecc6b4f410b0fc57b4759accae458f2085e76d2b Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 13:23:12 +0200 Subject: [PATCH 05/15] 5.Poprawienie formatowania --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- 1 file changed, 1 insertion(+), 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 7d324d00..ec0691fc 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -13,5 +13,5 @@ public void countIn(int in) { totalRejected++; else super.countIn(in); - } + } } From 442ab7e4d36fffd1f0edef5ba02a7fa23d21d7b2 Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 13:33:44 +0200 Subject: [PATCH 06/15] =?UTF-8?q?6.=20Merge=20ga=C5=82=C4=99zi=20format?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 cfb7eef4d9afce2a27b83b7f0624b9b2a2c9859a Mon Sep 17 00:00:00 2001 From: "LAPTOP-6HBQSBVI\\zuzan" <245886@edu.p.lodz.pl> Date: Sun, 19 May 2024 18:26:13 +0200 Subject: [PATCH 07/15] =?UTF-8?q?5.=20Zmiana=20nazw=20p=C3=B3l=20klas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 b54fef9a02917bff3f63da84885978e7336855fb Mon Sep 17 00:00:00 2001 From: Zuzanna Niciak Date: Mon, 6 May 2024 13:45:56 +0200 Subject: [PATCH 08/15] 4.1 Nadawanie nowych nazw klas --- ...hymer.java => DefaultCountingOutRhymer.java} | 2 +- .../java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../nursery/factory/DefaultRhymersFactory.java | 17 ++++++++--------- .../kis/vh/nursery/factory/RhymersFactory.java | 15 +++++++++++++++ .../kis/vh/nursery/factory/Rhymersfactory.java | 15 --------------- .../java/edu/kis/vh/nursery/RhymersDemo.java | 8 +++----- .../edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 8 files changed, 35 insertions(+), 38 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (93%) create mode 100644 src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java delete mode 100644 src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java 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..4708121b 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 { +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 new file mode 100644 index 00000000..292ec584 --- /dev/null +++ b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java @@ -0,0 +1,15 @@ +package edu.kis.vh.nursery.factory; + +import edu.kis.vh.nursery.DefaultCountingOutRhymer; + +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/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java deleted file mode 100644 index b480c321..00000000 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package edu.kis.vh.nursery.factory; - -import edu.kis.vh.nursery.defaultCountingOutRhymer; - -public interface Rhymersfactory { - - public defaultCountingOutRhymer GetStandardRhymer(); - - public defaultCountingOutRhymer GetFalseRhymer(); - - public defaultCountingOutRhymer GetFIFORhymer(); - - 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..f71fd49d 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,16 +1,14 @@ 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; +import edu.kis.vh.nursery.factory.RhymersFactory; class RhymersDemo { public static void main(String[] args) { - Rhymersfactory factory = new DefaultRhymersFactory(); + 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 da1b628f5c7da36ddbee7166734f1fa7c5078b19 Mon Sep 17 00:00:00 2001 From: "LAPTOP-6HBQSBVI\\zuzan" <245886@edu.p.lodz.pl> Date: Fri, 17 May 2024 11:58:38 +0200 Subject: [PATCH 09/15] =?UTF-8?q?=E2=80=9E4.2=20zmiana=20konwencji=20nazew?= =?UTF-8?q?niczej=20metod,=20oraz=20dodatkowe=20poprawki=20w=20nazewnictwi?= =?UTF-8?q?e=20klas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 4708121b..154e4d26 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 292ec584..a3f7650d 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 f71fd49d..18b8a8c7 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 ac084c1da287562d1fc2f072edb7470c32b99eae Mon Sep 17 00:00:00 2001 From: Dominik Pustelnik <245905@edu.p.lodz.pl> Date: Sun, 19 May 2024 20:03:21 +0200 Subject: [PATCH 10/15] =?UTF-8?q?6.=20Dodanie=20sta=C5=82ych=20zamiast=20l?= =?UTF-8?q?iteralow?= 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 | 5 +++-- 2 files changed, 12 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 89033a01..77fa6505 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..41855b79 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 { + public static final int EMPTY = -1; Node last; int i; @@ -25,13 +26,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 fe921aae50e94e832aa844c77d2b7254c0e36a3f Mon Sep 17 00:00:00 2001 From: Dominik Pustelnik <245905@edu.p.lodz.pl> Date: Sun, 19 May 2024 20:41:21 +0200 Subject: [PATCH 11/15] 7. Dodanie modyfikatorow final --- 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 13f788eb..cf6ec663 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 77fa6505..3ef6797f 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 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 84f9f9a904593089f175a2ea9206d3659d65691b Mon Sep 17 00:00:00 2001 From: Dominik Pustelnik <245905@edu.p.lodz.pl> Date: Sun, 19 May 2024 20:42:47 +0200 Subject: [PATCH 12/15] 8. Dodanie annotacji override --- 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 ec0691fc..270433a0 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++; From de47b6159993ad360682e4d58947dfd96390a198 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Sun, 26 May 2024 17:46:06 +0200 Subject: [PATCH 13/15] 9. Zastosowanie mozliwie najmniejszej widocznosci --- src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- 2 files 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 0c7e4e71..6398edcc 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -4,7 +4,7 @@ public class DefaultCountingOutRhymer { private int[] numbers = new int[12]; - public int total = -1; + private int total = -1; 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 3cea0867..b400bf11 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(); + private DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { From e9f6e018a206903646bb812bb13fae8fa84ede52 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Sun, 26 May 2024 18:02:05 +0200 Subject: [PATCH 14/15] 10. Generowanie getter dla pola total. --- .../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 6398edcc..34642c5b 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -4,6 +4,10 @@ public class DefaultCountingOutRhymer { private int[] numbers = new int[12]; + public int getTotal() { + return total; + } + private int total = -1; public void countIn(int in) { From 840bfa168899599f7884c60a13778d81e2cbed42 Mon Sep 17 00:00:00 2001 From: Zuzansas Date: Sun, 26 May 2024 18:11:23 +0200 Subject: [PATCH 15/15] =?UTF-8?q?11.=20Hermetyzacja=20nieprywatnych=20atry?= =?UTF-8?q?but=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/list/IntLinkedList.java | 8 ++++---- .../java/edu/kis/vh/nursery/list/Node.java | 20 +++++++++++++++++-- 2 files changed, 22 insertions(+), 6 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 07efc0a2..bb0f2d30 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -10,7 +10,7 @@ public void push(int i) { last = new Node(i); else { last.next = new Node(i); - last.next.prev = last; + last.next.setPrev(last); last = last.next; } } @@ -26,14 +26,14 @@ public boolean isFull() { public int top() { if (isEmpty()) return -1; - return last.value; + return last.getValue(); } public int pop() { if (isEmpty()) return -1; - int ret = last.value; - last = last.prev; + 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 1704f3ce..2afecba2 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -2,11 +2,27 @@ public class Node { - public int value; - public Node prev, next; + private int value; + private Node prev; + public Node next; public Node(int i) { value = 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; + } }