From 47e01f2c4af79cead5f9a5da3993b20852f0cd0b Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 21:34:24 +0200 Subject: [PATCH 01/20] 1. Dodanie pliku gitignore. --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..3a421819 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.idea/ +/target/ +/bin/ \ No newline at end of file From 7996fb320deb8fb3ade32a7d7f0b02f2ae53e8bd Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 21:35:26 +0200 Subject: [PATCH 02/20] 2. Poprawienie formatowania kodu w pliku HanoiRhymer. --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 8 ++++---- 1 file changed, 4 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..ec0691fc 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 void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!callCheck() && in > peekaboo()) totalRejected++; - else - super.countIn(in); + else + super.countIn(in); } } From a874b5ab956f3601b27e6909889a45d65d0f4641 Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 21:44:22 +0200 Subject: [PATCH 03/20] =?UTF-8?q?3.=20Scalenie=20ga=C5=82=C4=99zi=20master?= =?UTF-8?q?=20z=20ga=C5=82=C4=99ziom=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 4336d8bfcdd327e3e2c59d030943614e6b02c947 Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 21:56:04 +0200 Subject: [PATCH 04/20] 4.1. Poprawienie nazw class. --- ...mer.java => DefaultCountingOutRhymer.java} | 2 +- ...Rhymer.java => FirstInFirstOutRhymer.java} | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../factory/DefaultRhymersFactory.java | 21 +++++++++---------- .../vh/nursery/factory/RhymersFactory.java | 15 +++++++++++++ .../vh/nursery/factory/Rhymersfactory.java | 15 ------------- .../java/edu/kis/vh/nursery/RhymersDemo.java | 8 +++---- .../edu/kis/vh/nursery/RhymersJUnitTest.java | 10 ++++----- 8 files changed, 37 insertions(+), 40 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (93%) rename src/main/java/edu/kis/vh/nursery/{FIFORhymer.java => FirstInFirstOutRhymer.java} (68%) 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 89033a01..b46a9dc8 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/FirstInFirstOutRhymer.java similarity index 68% rename from src/main/java/edu/kis/vh/nursery/FIFORhymer.java rename to src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java index 13f788eb..0835a20f 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java @@ -1,8 +1,8 @@ package edu.kis.vh.nursery; -public class FIFORhymer extends defaultCountingOutRhymer { +public class FirstInFirstOutRhymer 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..bea7e5fe 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.DefaultCountingOutRhymer; +import edu.kis.vh.nursery.FirstInFirstOutRhymer; 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() { - return new FIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer() { + return new FirstInFirstOutRhymer(); } @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 c3e48a041bf6b5d8f72935f8f8a3718fc011462a Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 22:01:33 +0200 Subject: [PATCH 05/20] 4.2. Poprawienie nazw 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 bea7e5fe..77fcd5bf 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 getFirtsInFirstOutRhymer() { return new FirstInFirstOutRhymer(); } @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..067445de 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 getFirtsInFirstOutRhymer(); - 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..b348de53 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.getFirtsInFirstOutRhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) From 245c7b5f84b9fccd6ccd4cf0c2154487e1a91713 Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Sun, 12 May 2024 22:21:36 +0200 Subject: [PATCH 06/20] 5. Poprawa nazw zmiennych. --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../edu/kis/vh/nursery/defaultCountingOutRhymer.java | 10 +++++----- .../java/edu/kis/vh/nursery/list/IntLinkedList.java | 4 ++-- 4 files changed, 9 insertions(+), 9 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..33f50ec4 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() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index ec0691fc..f471bf52 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; + private int totalRejected = 0; public int reportRejected() { return totalRejected; diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 89033a01..fb60c5a0 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; + private 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--]; } } 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..af3427fd 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,8 +2,8 @@ public class IntLinkedList { - Node last; - int i; + private Node last; + private int i; public void push(int i) { if (last == null) From a52aef72d58809842a6c201d53bbb94da659653e Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:24:59 +0200 Subject: [PATCH 07/20] =?UTF-8?q?6.=20Zast=C4=85pienie=20litera=C5=82?= =?UTF-8?q?=C3=B3w=20sta=C5=82ymi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 12 ++++++++---- 1 file changed, 8 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 6398edcc..f69038e5 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,10 +1,14 @@ package edu.kis.vh.nursery; public class DefaultCountingOutRhymer { + static int EMPTY = -1; + static int FULL = 11; + static int SIZE = 12; - private int[] numbers = new int[12]; - private int total = -1; + private int[] numbers = new int[SIZE]; + + private int total = EMPTY; public void countIn(int in) { if (!isFull()) @@ -12,11 +16,11 @@ 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() { From d6450367c4e9da87fc8c1ff57fa04f3d9153f08a Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:28:21 +0200 Subject: [PATCH 08/20] =?UTF-8?q?6.1=20Zast=C4=85pienie=20litera=C5=82?= =?UTF-8?q?=C3=B3w=20sta=C5=82ymi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 6 +++--- src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java | 2 +- 2 files 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 f69038e5..c0b9978d 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,9 +1,9 @@ package edu.kis.vh.nursery; public class DefaultCountingOutRhymer { - static int EMPTY = -1; - static int FULL = 11; - static int SIZE = 12; + static final int EMPTY = -1; + static final int FULL = 11; + static final int SIZE = 12; private int[] numbers = new int[SIZE]; diff --git a/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java index 2405f223..816c3acd 100644 --- a/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java @@ -2,7 +2,7 @@ public class FirstInFirstOutRhymer extends DefaultCountingOutRhymer { - private defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + private DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { From 7b114f1d9792936bbeb45fed3112e49473640481 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:29:03 +0200 Subject: [PATCH 09/20] =?UTF-8?q?7.=20Dodanie=20modyfikatora=20final=20do?= =?UTF-8?q?=20sta=C5=82ych=20niemutowalnych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 c0b9978d..2a95a31f 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,7 +1,7 @@ package edu.kis.vh.nursery; public class DefaultCountingOutRhymer { - static final int EMPTY = -1; + static final int EMPTY = -1; static final int FULL = 11; static final int SIZE = 12; From 34c3442a794c8e076e86254bbaafb677131558f9 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:38:30 +0200 Subject: [PATCH 10/20] 8. Dodanie @Override w metodzie klasy HanoiRhymer.java --- 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 c649e432..234d27c4 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 79d62aeef9d5d9f57e62eaf1a9f66f32ef63c9b9 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 20 May 2024 14:17:30 +0200 Subject: [PATCH 11/20] =?UTF-8?q?6.2=20Zast=C4=85pienie=20litera=C5=82?= =?UTF-8?q?=C3=B3w=20sta=C5=82ymi=20w=20pliku=20DefaultCountingOutrhymer.j?= =?UTF-8?q?ava?= 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, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 2a95a31f..05dd9462 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,8 +2,8 @@ public class DefaultCountingOutRhymer { static final int EMPTY = -1; - static final int FULL = 11; static final int SIZE = 12; + static final int FULL = SIZE - 1; private int[] numbers = new int[SIZE]; @@ -25,13 +25,13 @@ public boolean isFull() { protected int peekaboo() { if (callCheck()) - return -1; + return EMPTY; return numbers[total]; } public int countOut() { if (callCheck()) - return -1; + return EMPTY; return numbers[total--]; } From a0350b8d6933a2854426097a38e77fb41c4a8170 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Mon, 20 May 2024 14:20:56 +0200 Subject: [PATCH 12/20] =?UTF-8?q?7.1=20Dodanie=20modyfikatora=20final=20do?= =?UTF-8?q?=20sta=C5=82ych=20niemutowalnych=20w=20plikach=20Node,=20Defaul?= =?UTF-8?q?tCountingOutRhymer=20,FIFORhymer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/list/Node.java | 2 +- 3 files 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 05dd9462..3cc35067 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -3,10 +3,10 @@ public class DefaultCountingOutRhymer { static final int EMPTY = -1; static final int SIZE = 12; - static final int FULL = SIZE - 1; + static final int FULL = SIZE - 1; - private int[] numbers = new int[SIZE]; + private final int[] numbers = new int[SIZE]; private int total = EMPTY; diff --git a/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java index 816c3acd..172c75a9 100644 --- a/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java @@ -2,7 +2,7 @@ public class FirstInFirstOutRhymer extends DefaultCountingOutRhymer { - private DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + private final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { 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 f731223757f4a3d1acc502572b64f1f53f34da71 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Fri, 24 May 2024 10:37:47 +0200 Subject: [PATCH 13/20] =?UTF-8?q?6.3=20Poprawienie=20definicji=20sta=C5=82?= =?UTF-8?q?ych=20w=20pliku=20DefaultCountingOutRhymer.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 12 +++++++----- 1 file changed, 7 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 3cc35067..40a07774 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,11 +2,13 @@ public class DefaultCountingOutRhymer { static final int EMPTY = -1; - static final int SIZE = 12; - static final int FULL = SIZE - 1; + static final int MAX_SIZE = 12; + static final int FULL = MAX_SIZE - 1; + static final int DEFAULT = -1; - private final int[] numbers = new int[SIZE]; + + private final int[] numbers = new int[MAX_SIZE]; private int total = EMPTY; @@ -16,7 +18,7 @@ public void countIn(int in) { } public boolean callCheck() { - return total == EMPTY; + return total == DEFAULT; } public boolean isFull() { @@ -25,7 +27,7 @@ public boolean isFull() { protected int peekaboo() { if (callCheck()) - return EMPTY; + return DEFAULT; return numbers[total]; } From 16a76845b8370b02df8090aa4ec79f43622c0578 Mon Sep 17 00:00:00 2001 From: Szymon Gieraga <245809@edu.p.lodz.pl> Date: Fri, 24 May 2024 10:57:01 +0200 Subject: [PATCH 14/20] =?UTF-8?q?6.4=20Dodanie=20sta=C5=82ych=20w=20pliku?= =?UTF-8?q?=20IntLinkedList.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 5 +++-- 1 file changed, 3 insertions(+), 2 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 af3427fd..595f52c4 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 { + static final int EMPTY_LIST = -1; private Node last; private int i; @@ -25,13 +26,13 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; + return EMPTY_LIST; return last.value; } public int pop() { if (isEmpty()) - return -1; + return EMPTY_LIST; int ret = last.value; last = last.prev; return ret; From f0e26b430cf7135e31884a6a6cdd65ccfb416af8 Mon Sep 17 00:00:00 2001 From: Sebastian Cieslik <245787@edu.p.lodz.pl> Date: Mon, 27 May 2024 12:40:55 +0200 Subject: [PATCH 15/20] =?UTF-8?q?9.=20Zmiana=20atrybut=C3=B3w=20klas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 8 ++++---- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 2 +- 2 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 40a07774..36184de8 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,11 +1,11 @@ package edu.kis.vh.nursery; public class DefaultCountingOutRhymer { - static final int EMPTY = -1; - static final int MAX_SIZE = 12; - static final int FULL = MAX_SIZE - 1; + private static final int EMPTY = -1; + private final int MAX_SIZE = 12; + private final int FULL = MAX_SIZE - 1; - static final int DEFAULT = -1; + private static final int DEFAULT = -1; private final int[] numbers = new int[MAX_SIZE]; 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 595f52c4..4d4006b7 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,7 +2,7 @@ public class IntLinkedList { - static final int EMPTY_LIST = -1; + private static final int EMPTY_LIST = -1; private Node last; private int i; From b2437addd4aafcd80a2b4faa7596f4dd06a6a3e3 Mon Sep 17 00:00:00 2001 From: Sebastian Cieslik <245787@edu.p.lodz.pl> Date: Mon, 27 May 2024 12:43:33 +0200 Subject: [PATCH 16/20] 10. Wygenerowanie gettera dla 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 36184de8..87583780 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -10,6 +10,10 @@ public class DefaultCountingOutRhymer { private final int[] numbers = new int[MAX_SIZE]; + public int getTotal() { + return total; + } + private int total = EMPTY; public void countIn(int in) { From c350d50a2bf354385f84b84cb960867ff8f7836f Mon Sep 17 00:00:00 2001 From: Sebastian Cieslik <245787@edu.p.lodz.pl> Date: Mon, 27 May 2024 12:46:44 +0200 Subject: [PATCH 17/20] =?UTF-8?q?11.=20Hermetyzacja=20publicznych=20atrymu?= =?UTF-8?q?t=C3=B3w=20klasy=20Node?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/list/IntLinkedList.java | 12 +++++----- .../java/edu/kis/vh/nursery/list/Node.java | 24 +++++++++++++++++-- 2 files changed, 28 insertions(+), 8 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 4d4006b7..1952f00b 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(); } } @@ -27,14 +27,14 @@ public boolean isFull() { public int top() { if (isEmpty()) return EMPTY_LIST; - return last.value; + return last.getValue(); } public int pop() { if (isEmpty()) return EMPTY_LIST; - 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 a77f7d52..04f834df 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,31 @@ public class Node { - public final int value; - public Node prev, next; + private final int value; + private Node prev; + private Node next; public Node(int i) { value = i; } + public int getValue() { + return 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; + } } From 58c59608afa98bc393b0a6afebb54dd958b50eb3 Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Mon, 3 Jun 2024 17:07:48 +0200 Subject: [PATCH 18/20] 13. Utworzenie metody testRhymers. --- .../java/edu/kis/vh/nursery/RhymersDemo.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index b348de53..a96f6ef3 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -7,27 +7,22 @@ class RhymersDemo { public static void main(String[] args) { RhymersFactory factory = new DefaultRhymersFactory(); - - DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(), - factory.getFirtsInFirstOutRhymer(), factory.getHanoiRhymer()}; - + testRhymers(factory); + } + + private static void testRhymers(RhymersFactory factory) { + DefaultCountingOutRhymer[] rhymers = {factory.getStandardRhymer(), factory.getFalseRhymer(), factory.getFirtsInFirstOutRhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) rhymers[j].countIn(i); - java.util.Random rn = new java.util.Random(); for (int i = 1; i < 15; i++) rhymers[3].countIn(rn.nextInt(20)); - for (int i = 0; i < rhymers.length; i++) { while (!rhymers[i].callCheck()) System.out.print(rhymers[i].countOut() + " "); System.out.println(); } - - System.out.println("total rejected is " - + ((HanoiRhymer) rhymers[3]).reportRejected()); - + System.out.println("total rejected is " + ((HanoiRhymer) rhymers[3]).reportRejected()); } - } \ No newline at end of file From 947829e8fde4dc6dfc5bf027398691200893d53e Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Mon, 3 Jun 2024 17:17:54 +0200 Subject: [PATCH 19/20] =?UTF-8?q?14.=20Przeniesienie=20klasy=20Node=20do?= =?UTF-8?q?=20IntLinkedList=20oraz=20zmiana=20z=20publicznej=20na=20prywat?= =?UTF-8?q?n=C4=85.=20Usuni=C4=99cie=20pilku=20Node.java?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/list/IntLinkedList.java | 29 +++++++++++++++++ .../java/edu/kis/vh/nursery/list/Node.java | 32 ------------------- 2 files changed, 29 insertions(+), 32 deletions(-) delete mode 100644 src/main/java/edu/kis/vh/nursery/list/Node.java 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 1952f00b..b6411185 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -37,5 +37,34 @@ public int pop() { last = last.getPrev(); return ret; } + private class Node { + private final int value; + private Node prev; + private Node next; + + public Node(int i) { + value = i; + } + + public int getValue() { + return 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; + } + } } diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java deleted file mode 100644 index 04f834df..00000000 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ /dev/null @@ -1,32 +0,0 @@ -package edu.kis.vh.nursery.list; - -public class Node { - - private final int value; - private Node prev; - private Node next; - - public Node(int i) { - value = i; - } - - public int getValue() { - return 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; - } -} From 3809e233e5c950c704c13f65f66b43fdfb6fae11 Mon Sep 17 00:00:00 2001 From: Sebastian <245787@edu.p.lodz.pl> Date: Mon, 3 Jun 2024 18:27:46 +0200 Subject: [PATCH 20/20] 17. Stworzenie dokumentacji dla klasy DefaultCountingOutRhymer. --- .../vh/nursery/DefaultCountingOutRhymer.java | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 87583780..42953049 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,5 +1,7 @@ package edu.kis.vh.nursery; - +/* + The DefaultCountingOutRhymer class is used to count out rhymers. +*/ public class DefaultCountingOutRhymer { private static final int EMPTY = -1; private final int MAX_SIZE = 12; @@ -9,32 +11,46 @@ public class DefaultCountingOutRhymer { private final int[] numbers = new int[MAX_SIZE]; - + /* + getTotal method returns value of elements in array numbers. + variable total is a number of rhymers in array. + */ public int getTotal() { return total; } private int total = EMPTY; - + /* + countIn method inserts value into numbers array after the last element, if array isn't full. + argument in is a value that will be inserted into array as the next element. + */ public void countIn(int in) { if (!isFull()) numbers[++total] = in; } - + /* + callCheck is a method that returns true, if array number is empty, otherwise returns false. + */ public boolean callCheck() { return total == DEFAULT; } - + /* + isFull is a method that returns true, if array number is full. + */ public boolean isFull() { return total == FULL; } - + /* + peekaboo is a method that returns value of the last inserted element into number's array, if array isn't empty, otherwise returns DEFAULT value. + */ protected int peekaboo() { if (callCheck()) return DEFAULT; return numbers[total]; } - + /* + countOut method is returning last inserted elements and reduce last element, if array numbers isn't empty, otherwise returns EMPTY value. + */ public int countOut() { if (callCheck()) return EMPTY;