From f308aae54207466730e13a079b7599d91658dda4 Mon Sep 17 00:00:00 2001 From: unknown <245763@helium.com> Date: Mon, 8 Apr 2024 12:54:04 +0200 Subject: [PATCH 01/11] 1. dodanie pliku gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..62c89355 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ \ No newline at end of file From f443f4d04662ab30a09868040d73ee1fb9123c95 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 12:58:26 +0200 Subject: [PATCH 02/11] =?UTF-8?q?2.=20Poprawa=20b=C5=82=C4=99d=C3=B3w=20fo?= =?UTF-8?q?rmatowania=20w=20klasie=20HanoiRhymer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 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..ce52f904 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,7 +2,7 @@ public class HanoiRhymer extends defaultCountingOutRhymer { -int totalRejected = 0; + int totalRejected = 0; public int reportRejected() { return totalRejected; @@ -10,8 +10,9 @@ public int reportRejected() { public void countIn(int in) { if (!callCheck() && in > peekaboo()) - totalRejected++; - else - super.countIn(in); + totalRejected++; + else + super.countIn(in); } + } From c236f560092d54e23a7304572d998e0b952be236 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:15:56 +0200 Subject: [PATCH 03/11] =?UTF-8?q?2.=20Poprawa=20b=C5=82=C4=99d=C3=B3w=20fo?= =?UTF-8?q?rmatowania=20w=20klasie=20HanoiRhymer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 ce52f904..ec0691fc 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -9,10 +9,9 @@ public int reportRejected() { } public void countIn(int in) { - if (!callCheck() && in > peekaboo()) - totalRejected++; - else - super.countIn(in); + if (!callCheck() && in > peekaboo()) + totalRejected++; + else + super.countIn(in); } - } From eab9af95f45db7138be4a1d9deff14bd117a99e7 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sat, 13 Apr 2024 18:18:47 +0200 Subject: [PATCH 04/11] 4.1 poprawa nazw klas --- .../{FIFORhymer.java => FIFOrhymer.java} | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- ...ntingOutRhymer.java => defaultRhymer.java} | 2 +- .../factory/DefaultRhymersFactory.java | 19 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 10 +++++----- .../java/edu/kis/vh/nursery/RhymersDemo.java | 4 +--- .../edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 7 files changed, 24 insertions(+), 27 deletions(-) rename src/main/java/edu/kis/vh/nursery/{FIFORhymer.java => FIFOrhymer.java} (71%) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => defaultRhymer.java} (95%) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java similarity index 71% rename from src/main/java/edu/kis/vh/nursery/FIFORhymer.java rename to src/main/java/edu/kis/vh/nursery/FIFOrhymer.java index 28591ada..0f3927e0 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 defaultRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public defaultRhymer temp = new defaultRhymer(); @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..c00321e9 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 defaultRhymer { int totalRejected = 0; diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java similarity index 95% rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java rename to src/main/java/edu/kis/vh/nursery/defaultRhymer.java index 199abf6d..35756e42 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class defaultCountingOutRhymer { +public class defaultRhymer { private int[] NUMBERS = new int[12]; 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..9d0328c8 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.FIFORhymer; +import edu.kis.vh.nursery.defaultRhymer; +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 defaultRhymer GetStandardRhymer() { + return new defaultRhymer(); } @Override - public defaultCountingOutRhymer GetFalseRhymer() { - return new defaultCountingOutRhymer(); + public defaultRhymer GetFalseRhymer() { + return new defaultRhymer(); } @Override - public defaultCountingOutRhymer GetFIFORhymer() { - return new FIFORhymer(); + public defaultRhymer GetFIFORhymer() { + return new FIFOrhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public defaultRhymer 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 033755d0..b35f251e 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.defaultRhymer; public interface Rhymersfactory { - public defaultCountingOutRhymer GetStandardRhymer(); + public defaultRhymer GetStandardRhymer(); - public defaultCountingOutRhymer GetFalseRhymer(); + public defaultRhymer GetFalseRhymer(); - public defaultCountingOutRhymer GetFIFORhymer(); + public defaultRhymer GetFIFORhymer(); - public defaultCountingOutRhymer GetHanoiRhymer(); + public defaultRhymer 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..c60e0600 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(), + defaultRhymer[] 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..1ef7f9fc 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(); + defaultRhymer rhymer = new defaultRhymer(); int testValue = 4; rhymer.countIn(testValue); @@ -17,7 +17,7 @@ public void testCountIn() { @Test public void testCallCheck() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + defaultRhymer rhymer = new defaultRhymer(); boolean result = rhymer.callCheck(); Assert.assertEquals(true, result); @@ -29,7 +29,7 @@ public void testCallCheck() { @Test public void testIsFull() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + defaultRhymer rhymer = new defaultRhymer(); 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(); + defaultRhymer rhymer = new defaultRhymer(); 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(); + defaultRhymer rhymer = new defaultRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.countOut(); From 8f0ba5db79dae393ffc66731ac6ffd7b901dec15 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sat, 13 Apr 2024 18:22:24 +0200 Subject: [PATCH 05/11] 4.2 zmiana nazewnictwa metod --- src/main/java/edu/kis/vh/nursery/FIFOrhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/defaultRhymer.java | 8 ++++---- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 ++-- .../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 12 ++++++------ 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java index 0f3927e0..3444887d 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java @@ -6,13 +6,13 @@ public class FIFOrhymer extends defaultRhymer { @Override public int countOut() { - while (!callCheck()) + while (!check()) temp.countIn(super.countOut()); int ret = temp.countOut(); - while (!temp.callCheck()) + while (!temp.check()) countIn(temp.countOut()); diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index c00321e9..ced5fda0 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -4,12 +4,12 @@ public class HanoiRhymer extends defaultRhymer { int totalRejected = 0; - public int reportRejected() { + public int RejectedReports() { return totalRejected; } public void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!check() && in > getNumber()) totalRejected++; else super.countIn(in); diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index 35756e42..6c8efe7f 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -11,7 +11,7 @@ public void countIn(int in) { NUMBERS[++total] = in; } - public boolean callCheck() { + public boolean check() { return total == -1; } @@ -19,14 +19,14 @@ public boolean isFull() { return total == 11; } - protected int peekaboo() { - if (callCheck()) + protected int getNumber() { + if (check()) return -1; return NUMBERS[total]; } public int countOut() { - if (callCheck()) + if (check()) return -1; return NUMBERS[total--]; } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index c60e0600..e34be36a 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -20,13 +20,13 @@ public static void main(String[] args) { rhymers[3].countIn(rn.nextInt(20)); for (int i = 0; i < rhymers.length; i++) { - while (!rhymers[i].callCheck()) + while (!rhymers[i].check()) System.out.print(rhymers[i].countOut() + " "); System.out.println(); } System.out.println("total rejected is " - + ((HanoiRhymer) rhymers[3]).reportRejected()); + + ((HanoiRhymer) rhymers[3]).RejectedReports()); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index 1ef7f9fc..c030de2e 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -11,19 +11,19 @@ public void testCountIn() { int testValue = 4; rhymer.countIn(testValue); - int result = rhymer.peekaboo(); + int result = rhymer.getNumber(); Assert.assertEquals(testValue, result); } @Test public void testCallCheck() { defaultRhymer rhymer = new defaultRhymer(); - boolean result = rhymer.callCheck(); + boolean result = rhymer.check(); Assert.assertEquals(true, result); rhymer.countIn(888); - result = rhymer.callCheck(); + result = rhymer.check(); Assert.assertEquals(false, result); } @@ -46,15 +46,15 @@ public void testPeekaboo() { defaultRhymer rhymer = new defaultRhymer(); final int EMPTY_STACK_VALUE = -1; - int result = rhymer.peekaboo(); + int result = rhymer.getNumber(); Assert.assertEquals(EMPTY_STACK_VALUE, result); int testValue = 4; rhymer.countIn(testValue); - result = rhymer.peekaboo(); + result = rhymer.getNumber(); Assert.assertEquals(testValue, result); - result = rhymer.peekaboo(); + result = rhymer.getNumber(); Assert.assertEquals(testValue, result); } From 423476a0525d335ec629dc9db6b81c06c15d3f92 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sat, 13 Apr 2024 18:27:07 +0200 Subject: [PATCH 06/11] =?UTF-8?q?5.=20zmiana=20konwencji=20nazewniczej=20p?= =?UTF-8?q?=C3=B3l=20klas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 10 +++++----- .../edu/kis/vh/nursery/defaultCountingOutRhymer.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 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..dc02e3a1 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,19 +2,19 @@ public class FIFORhymer extends defaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); @Override public int countOut() { while (!callCheck()) - temp.countIn(super.countOut()); + rhymer.countIn(super.countOut()); - int ret = temp.countOut(); + int ret = rhymer.countOut(); - while (!temp.callCheck()) + while (!rhymer.callCheck()) - countIn(temp.countOut()); + countIn(rhymer.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..78af0fb6 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -4,31 +4,31 @@ public class defaultCountingOutRhymer { private int[] NUMBERS = new int[12]; - public int total = -1; + public int totalNumbers = -1; public void countIn(int in) { if (!isFull()) - NUMBERS[++total] = in; + NUMBERS[++totalNumbers] = in; } public boolean callCheck() { - return total == -1; + return totalNumbers == -1; } public boolean isFull() { - return total == 11; + return totalNumbers == 11; } protected int peekaboo() { if (callCheck()) return -1; - return NUMBERS[total]; + return NUMBERS[totalNumbers]; } public int countOut() { if (callCheck()) return -1; - return NUMBERS[total--]; + return NUMBERS[totalNumbers--]; } } From 3ea2d2185d71d6aa267b0be7a2e186d163082ac0 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sat, 13 Apr 2024 18:30:56 +0200 Subject: [PATCH 07/11] 4.2 zmiana nazewnictwa metod --- src/main/java/edu/kis/vh/nursery/FIFOrhymer.java | 8 ++++---- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../java/edu/kis/vh/nursery/defaultRhymer.java | 4 ++-- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 2 +- .../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 14 +++++++------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java index 3444887d..feacf684 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java @@ -5,16 +5,16 @@ public class FIFOrhymer extends defaultRhymer { public defaultRhymer temp = new defaultRhymer(); @Override - public int countOut() { + public int getPenultimateNumber() { while (!check()) - temp.countIn(super.countOut()); + temp.countIn(super.getPenultimateNumber()); - int ret = temp.countOut(); + int ret = temp.getPenultimateNumber(); while (!temp.check()) - countIn(temp.countOut()); + countIn(temp.getPenultimateNumber()); return ret; } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index ced5fda0..8eb9e622 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -9,7 +9,7 @@ public int RejectedReports() { } public void countIn(int in) { - if (!check() && in > getNumber()) + if (!check() && in > getLastNumber()) totalRejected++; else super.countIn(in); diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index 6c8efe7f..cb2c409a 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -19,13 +19,13 @@ public boolean isFull() { return total == 11; } - protected int getNumber() { + protected int getLastNumber() { if (check()) return -1; return NUMBERS[total]; } - public int countOut() { + public int getPenultimateNumber() { if (check()) return -1; return NUMBERS[total--]; diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index e34be36a..76a99c49 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -21,7 +21,7 @@ public static void main(String[] args) { for (int i = 0; i < rhymers.length; i++) { while (!rhymers[i].check()) - System.out.print(rhymers[i].countOut() + " "); + System.out.print(rhymers[i].getPenultimateNumber() + " "); System.out.println(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index c030de2e..14fc60f1 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -11,7 +11,7 @@ public void testCountIn() { int testValue = 4; rhymer.countIn(testValue); - int result = rhymer.getNumber(); + int result = rhymer.getLastNumber(); Assert.assertEquals(testValue, result); } @@ -46,15 +46,15 @@ public void testPeekaboo() { defaultRhymer rhymer = new defaultRhymer(); final int EMPTY_STACK_VALUE = -1; - int result = rhymer.getNumber(); + int result = rhymer.getLastNumber(); Assert.assertEquals(EMPTY_STACK_VALUE, result); int testValue = 4; rhymer.countIn(testValue); - result = rhymer.getNumber(); + result = rhymer.getLastNumber(); Assert.assertEquals(testValue, result); - result = rhymer.getNumber(); + result = rhymer.getLastNumber(); Assert.assertEquals(testValue, result); } @@ -63,15 +63,15 @@ public void testCountOut() { defaultRhymer rhymer = new defaultRhymer(); final int EMPTY_STACK_VALUE = -1; - int result = rhymer.countOut(); + int result = rhymer.getPenultimateNumber(); Assert.assertEquals(EMPTY_STACK_VALUE, result); int testValue = 4; rhymer.countIn(testValue); - result = rhymer.countOut(); + result = rhymer.getPenultimateNumber(); Assert.assertEquals(testValue, result); - result = rhymer.countOut(); + result = rhymer.getPenultimateNumber(); Assert.assertEquals(EMPTY_STACK_VALUE, result); } From cece72a9050c192f69f4b1acb855ed5430080874 Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sun, 19 May 2024 11:51:04 +0200 Subject: [PATCH 08/11] 9. Zastosowanie najmniejszej widocznosci --- .../java/edu/kis/vh/nursery/FIFOrhymer.java | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 6 ++--- .../edu/kis/vh/nursery/defaultRhymer.java | 22 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java index feacf684..accb3efa 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java @@ -2,10 +2,10 @@ public class FIFOrhymer extends defaultRhymer { - public defaultRhymer temp = new defaultRhymer(); + private final defaultRhymer temp = new defaultRhymer(); @Override - public int getPenultimateNumber() { + protected int getPenultimateNumber() { while (!check()) temp.countIn(super.getPenultimateNumber()); diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 8eb9e622..bff174a9 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -2,13 +2,13 @@ public class HanoiRhymer extends defaultRhymer { - int totalRejected = 0; + private int totalRejected = 0; - public int RejectedReports() { + protected int RejectedReports() { return totalRejected; } - public void countIn(int in) { + protected void countIn(int in) { if (!check() && in > getLastNumber()) totalRejected++; else diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index cb2c409a..13100a18 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -2,30 +2,30 @@ public class defaultRhymer { - private int[] NUMBERS = new int[12]; + private final int[] NUMBERS = new int[12]; - public int total = -1; + private int total = -1; - public void countIn(int in) { + protected void countIn(int in) { if (!isFull()) NUMBERS[++total] = in; } - public boolean check() { - return total == -1; - } - - public boolean isFull() { + protected boolean check() { + return total == -1; + } + + protected boolean isFull() { return total == 11; } - + protected int getLastNumber() { if (check()) return -1; return NUMBERS[total]; } - - public int getPenultimateNumber() { + + protected int getPenultimateNumber() { if (check()) return -1; return NUMBERS[total--]; From 653cd2da519cd259ea83161de0ec8ada399a76ca Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sun, 19 May 2024 11:52:02 +0200 Subject: [PATCH 09/11] 10. Wygenerowanie gettera dla pola total w klasie DefaultCountingOutRhymer --- src/main/java/edu/kis/vh/nursery/defaultRhymer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index 13100a18..d4b28fdf 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -6,6 +6,10 @@ public class defaultRhymer { private int total = -1; + public int getTotal() { + return total; + } + protected void countIn(int in) { if (!isFull()) NUMBERS[++total] = in; From 1293efec50059109a1aaa5f7bcd1863389b2780a Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sun, 19 May 2024 11:54:57 +0200 Subject: [PATCH 10/11] 11. Hermetyzacja nieprywatnych atrybutow --- src/main/java/edu/kis/vh/nursery/FIFOrhymer.java | 4 ++++ src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 8 ++++++++ src/main/java/edu/kis/vh/nursery/defaultRhymer.java | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java index accb3efa..a7bdd886 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFOrhymer.java @@ -18,4 +18,8 @@ protected int getPenultimateNumber() { return ret; } + + public defaultRhymer getTemp() { + return temp; + } } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index bff174a9..e91288eb 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -14,4 +14,12 @@ protected void countIn(int in) { else super.countIn(in); } + + public int getTotalRejected() { + return totalRejected; + } + + public void setTotalRejected(int totalRejected) { + this.totalRejected = totalRejected; + } } diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index d4b28fdf..d796d466 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -35,4 +35,11 @@ protected int getPenultimateNumber() { return NUMBERS[total--]; } + public int[] getNUMBERS() { + return NUMBERS; + } + + public void setTotal(int total) { + this.total = total; + } } From cb99f3d6beecd3d18931df078d09d5466490372b Mon Sep 17 00:00:00 2001 From: Natalia Balicka <245763@edu.p.lodz.pl> Date: Sun, 19 May 2024 11:56:18 +0200 Subject: [PATCH 11/11] 12. Usuniecie nieuzywanych setterow --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 +--- src/main/java/edu/kis/vh/nursery/defaultRhymer.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index e91288eb..17d50962 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -19,7 +19,5 @@ public int getTotalRejected() { return totalRejected; } - public void setTotalRejected(int totalRejected) { - this.totalRejected = totalRejected; - } + } diff --git a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java index d796d466..1ab12d4e 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultRhymer.java @@ -39,7 +39,5 @@ public int[] getNUMBERS() { return NUMBERS; } - public void setTotal(int total) { - this.total = total; - } + }