From 53255637fb21262dfb25410b0bf4a3404376bebb Mon Sep 17 00:00:00 2001 From: Hanna Sauchuk <248664@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:31:35 +0200 Subject: [PATCH 01/25] 1. Dodanie pliku gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..8bd3a058 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/target/ +/.settings/ +/.classpath +/.project From ea3398d91ba9870f5de45e444fb984ad8438dcc5 Mon Sep 17 00:00:00 2001 From: Hanna Sauchuk <248664@edu.p.lodz.pl> Date: Mon, 8 Apr 2024 13:51:12 +0200 Subject: [PATCH 02/25] 2.Poprawka bledow formotawania --- 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..d1a3b36f 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 286b201825ce62ba115e75c8e84ee95398dbf3c5 Mon Sep 17 00:00:00 2001 From: Hanna Sauchuk <248664@edu.p.lodz.pl> Date: Mon, 6 May 2024 13:18:54 +0200 Subject: [PATCH 03/25] 2. Poprawka bledow formotawania_2 --- 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 d1a3b36f..86841777 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; From 6c58b8ee5f07932516c50220731a079cc1b066cd Mon Sep 17 00:00:00 2001 From: Hanna Sauchuk <248664@edu.p.lodz.pl> Date: Mon, 6 May 2024 13:29:30 +0200 Subject: [PATCH 04/25] 2. Poprawka bledow formotawania_3 --- 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 86841777..ec0691fc 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 reportRejected() { } public void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!callCheck() && in > peekaboo()) totalRejected++; else super.countIn(in); From 0b966c588bf9853c89505047e0e89e0f37621185 Mon Sep 17 00:00:00 2001 From: Hanna Sauchuk <248664@edu.p.lodz.pl> Date: Mon, 6 May 2024 13:39:06 +0200 Subject: [PATCH 05/25] 3. Scalowanie zmian z galezi format do master --- .../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 5e8dd96074bf1e7e085f5abc0774792e831ea201 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 13 May 2024 10:31:11 +0200 Subject: [PATCH 06/25] 4.1 Poprawa nazw klas --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../vh/nursery/defaultCountingOutRhymer.java | 2 +- .../factory/DefaultRhymersFactory.java | 21 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 12 +++++------ 5 files changed, 20 insertions(+), 21 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..f50c5e3a 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/defaultCountingOutRhymer.java b/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/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 60ba2a16..040aa252 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.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() { - return new FIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer() { + return new FifoRhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer GetHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index b480c321..292ec584 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -1,15 +1,15 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; -public interface Rhymersfactory { +public 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(); } From d39663b9948241b6a1b404a9fa9e40b86d3a7c51 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 13 May 2024 10:46:37 +0200 Subject: [PATCH 07/25] 4.2 Poprawa nazw metod --- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 8 ++++---- .../java/edu/kis/vh/nursery/factory/Rhymersfactory.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 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 040aa252..4622b671 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(); } From 19ecc5eecd70c9f8dcc74082333e0f26d4dcc071 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 13 May 2024 11:03:37 +0200 Subject: [PATCH 08/25] Nowy gitignore (bo zmienialam srodowisko pracy z Eklipse na IntellijIDEA) --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitignore b/.gitignore index 8bd3a058..ba926d99 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,8 @@ /.settings/ /.classpath /.project + +target/ +.idea/ +*.iml +*.iws \ No newline at end of file From 72e977b61ae952297331592ef4ccda7a8e4106ea Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 13 May 2024 11:13:52 +0200 Subject: [PATCH 09/25] 5.1 Poprawa bledow konwencji nazewniczej pol klas --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../vh/nursery/defaultCountingOutRhymer.java | 10 ++++----- .../factory/DefaultRhymersFactory.java | 21 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 12 +++++------ 5 files changed, 24 insertions(+), 25 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..f50c5e3a 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/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 89033a01..0c7e4e71 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -1,14 +1,14 @@ package edu.kis.vh.nursery; -public class defaultCountingOutRhymer { +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--]; } } 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..4622b671 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.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() { - return new FIFORhymer(); + public DefaultCountingOutRhymer getFIFORhymer() { + return new FifoRhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer getHanoiRhymer() { return new HanoiRhymer(); } diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index b480c321..a3f7650d 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -1,15 +1,15 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; -public interface Rhymersfactory { +public 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(); } From 97f87ad3022e0281c8b49d40d042602475202120 Mon Sep 17 00:00:00 2001 From: DanielKarolak <245838@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:19:12 +0200 Subject: [PATCH 10/25] Name Fix --- .../nursery/DefaultCountingOutRhymerFix.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java new file mode 100644 index 00000000..61c0ef15 --- /dev/null +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java @@ -0,0 +1,35 @@ +package edu.kis.vh.nursery; + +public class DefaultCountingOutRhymerFix { + + public static final int MIN = -1; + private int[] numbers = new int[12]; + + public int total = MIN; + + public void countIn(int in) { + if (!isFull()) + numbers[++total] = in; + } + + public boolean callCheck() { + return total == MIN; + } + + public boolean isFull() { + return total == 11; + } + + protected int peekaboo() { + if (callCheck()) + return MIN; + return numbers[total]; + } + + public int countOut() { + if (callCheck()) + return MIN; + return numbers[total--]; + } + +} From 1bd4361c735be534ed6b917759f717c4f84f94f6 Mon Sep 17 00:00:00 2001 From: DanielKarolak <245838@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:20:37 +0200 Subject: [PATCH 11/25] Final correct name. --- .../nursery/DefaultCountingOutRhymerFix.java | 35 ------------------- 1 file changed, 35 deletions(-) delete mode 100644 src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java deleted file mode 100644 index 61c0ef15..00000000 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymerFix.java +++ /dev/null @@ -1,35 +0,0 @@ -package edu.kis.vh.nursery; - -public class DefaultCountingOutRhymerFix { - - public static final int MIN = -1; - private int[] numbers = new int[12]; - - public int total = MIN; - - public void countIn(int in) { - if (!isFull()) - numbers[++total] = in; - } - - public boolean callCheck() { - return total == MIN; - } - - public boolean isFull() { - return total == 11; - } - - protected int peekaboo() { - if (callCheck()) - return MIN; - return numbers[total]; - } - - public int countOut() { - if (callCheck()) - return MIN; - return numbers[total--]; - } - -} From bc2b6d28d1582409802bc1d823e0d99fb5527fcb Mon Sep 17 00:00:00 2001 From: DanielKarolak <245838@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:39:07 +0200 Subject: [PATCH 12/25] =?UTF-8?q?6.=20Deklaracja=20sta=C5=82ych.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nursery/{FIFORhymer.java => FifoRhymer.java} | 0 .../kis/vh/nursery/defaultCountingOutRhymer.java | 15 +++++++++------ .../edu/kis/vh/nursery/list/IntLinkedList.java | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) rename src/main/java/edu/kis/vh/nursery/{FIFORhymer.java => FifoRhymer.java} (100%) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java similarity index 100% rename from src/main/java/edu/kis/vh/nursery/FIFORhymer.java rename to src/main/java/edu/kis/vh/nursery/FifoRhymer.java diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 0c7e4e71..a03ef1cf 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 MIN = -1; + public static final int AMOUNT_OF_NUMBERS = 12; + public static final int NUMBER_COUNTER = 11; + private int[] numbers = new int[AMOUNT_OF_NUMBERS]; - public int total = -1; + public int total = MIN; public void countIn(int in) { if (!isFull()) @@ -12,22 +15,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == MIN; } public boolean isFull() { - return total == 11; + return total == NUMBER_COUNTER; } protected int peekaboo() { if (callCheck()) - return -1; + return MIN; return numbers[total]; } public int countOut() { if (callCheck()) - return -1; + return MIN; 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..22bf0d3d 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 MIN = -1; Node last; int i; @@ -25,13 +26,13 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; + return MIN; return last.value; } public int pop() { if (isEmpty()) - return -1; + return MIN; int ret = last.value; last = last.prev; return ret; From 69f339a512cff9b67123d9cc1f75b48d93226a7f Mon Sep 17 00:00:00 2001 From: DanielKarolak <245838@edu.p.lodz.pl> Date: Mon, 13 May 2024 13:41:56 +0200 Subject: [PATCH 13/25] 7. Modyfikator final. --- 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 a03ef1cf..f3e58b52 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 MIN = -1; public static final int AMOUNT_OF_NUMBERS = 12; public static final int NUMBER_COUNTER = 11; - private int[] numbers = new int[AMOUNT_OF_NUMBERS]; + private final int[] numbers = new int[AMOUNT_OF_NUMBERS]; public int total = MIN; From 757c67d62a30b8a6128ae865538b4e1967bfb9c5 Mon Sep 17 00:00:00 2001 From: AdamSzymanskii <117367082+AdamSzymanskii@users.noreply.github.com> Date: Mon, 20 May 2024 09:50:56 +0200 Subject: [PATCH 14/25] 4.1 Zmiana nazwy klasy z defaultCountingOutRhymer.java na DefaultCountingOutRhymer.java --- ...efaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (100%) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java similarity index 100% rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java rename to src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java From 1b05fea274787e5e5a68382338d61ec48666a0f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Szyma=C5=84ski?= Date: Mon, 20 May 2024 09:56:21 +0200 Subject: [PATCH 15/25] 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 89ffa912..25ea2f84 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 f1ff3d0eea684e519ee576fe41148343d43fc227 Mon Sep 17 00:00:00 2001 From: AdamSzymanskii <117367082+AdamSzymanskii@users.noreply.github.com> Date: Mon, 20 May 2024 20:09:10 +0200 Subject: [PATCH 16/25] 7.1 dodanie final w klasie Node --- src/main/java/edu/kis/vh/nursery/list/Node.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java index 1704f3ce..a77f7d52 100644 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ b/src/main/java/edu/kis/vh/nursery/list/Node.java @@ -2,7 +2,7 @@ public class Node { - public int value; + public final int value; public Node prev, next; public Node(int i) { From 3bb161974d45d962c142e8b68f09560b98ac2b7f Mon Sep 17 00:00:00 2001 From: AdamSzymanskii <117367082+AdamSzymanskii@users.noreply.github.com> Date: Mon, 20 May 2024 20:09:45 +0200 Subject: [PATCH 17/25] 7.1.1 Dodanie final w klasie FifiRyhmer --- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index f50c5e3a..34467eb8 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -2,7 +2,7 @@ public class FifoRhymer extends DefaultCountingOutRhymer { - public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + public final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { From f04901341b3a55e648a56d559a5281240b611b2a Mon Sep 17 00:00:00 2001 From: AdamSzymanskii <117367082+AdamSzymanskii@users.noreply.github.com> Date: Sun, 26 May 2024 13:17:59 +0200 Subject: [PATCH 18/25] Update DefaultCountingOutRhymer.java --- .../vh/nursery/DefaultCountingOutRhymer.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index f3e58b52..f2755db7 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,12 +2,12 @@ public class DefaultCountingOutRhymer { - public static final int MIN = -1; - public static final int AMOUNT_OF_NUMBERS = 12; - public static final int NUMBER_COUNTER = 11; - private final int[] numbers = new int[AMOUNT_OF_NUMBERS]; + public static final int EMPTY = -1; + public static final int PEEKABOO_MIN = -1; + public static final int MAX_SIZE = 12; + private final int[] numbers = new int[MAX_SIZE]; - public int total = MIN; + public int total = EMPTY; public void countIn(int in) { if (!isFull()) @@ -15,22 +15,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == MIN; + return total == EMPTY; } public boolean isFull() { - return total == NUMBER_COUNTER; + return total == MAX_SIZE - 1; } protected int peekaboo() { if (callCheck()) - return MIN; + return PEEKABOO_MIN; return numbers[total]; } public int countOut() { if (callCheck()) - return MIN; + return EMPTY; return numbers[total--]; } From c140d4a72281c679e6854eba67ae4432a0f3e922 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 27 May 2024 20:54:25 +0200 Subject: [PATCH 19/25] =?UTF-8?q?9.Zastosowanie=20mo=C5=BCliwie=20najmniej?= =?UTF-8?q?sz=C4=85=20widoczno=C5=9B=C4=87?= 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/FifoRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../factory/{Rhymersfactory.java => RhymersFactory.java} | 0 src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/edu/kis/vh/nursery/factory/{Rhymersfactory.java => RhymersFactory.java} (100%) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index f2755db7..8eb25d39 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,12 +2,12 @@ public class DefaultCountingOutRhymer { - public static final int EMPTY = -1; - public static final int PEEKABOO_MIN = -1; - public static final int MAX_SIZE = 12; + private static final int EMPTY = -1; + private static final int PEEKABOO_MIN = -1; + private static final int MAX_SIZE = 12; private final int[] numbers = new int[MAX_SIZE]; - public int total = EMPTY; + private int total = EMPTY; 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 34467eb8..8299dfcf 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -2,7 +2,7 @@ public class FifoRhymer extends DefaultCountingOutRhymer { - public final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + private final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 25ea2f84..234d27c4 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/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java similarity index 100% rename from src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java rename to src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.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 22bf0d3d..37dfcd4d 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,9 +2,9 @@ public class IntLinkedList { - public static final int MIN = -1; - Node last; - int i; + private static final int MIN = -1; + private Node last; + private int i; public void push(int i) { if (last == null) From d51782a92f92089ede3843aa634674baed8a7932 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 27 May 2024 20:55:51 +0200 Subject: [PATCH 20/25] 10. Dodanie getter do zmiennej 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 8eb25d39..803a9840 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -7,6 +7,10 @@ public class DefaultCountingOutRhymer { private static final int MAX_SIZE = 12; private final int[] numbers = new int[MAX_SIZE]; + public int getTotal() { + return total; + } + private int total = EMPTY; public void countIn(int in) { From 51ee70e98c34d03d64ad515b202e6ed1aa4d1a2f Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 27 May 2024 20:58:44 +0200 Subject: [PATCH 21/25] =?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 --- .../java/edu/kis/vh/nursery/FifoRhymer.java | 12 ++++--- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 12 +++++-- .../kis/vh/nursery/list/IntLinkedList.java | 33 ++++++++++++++----- .../java/edu/kis/vh/nursery/list/Node.java | 24 ++++++++++++-- 4 files changed, 64 insertions(+), 17 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 8299dfcf..64b1c763 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -7,13 +7,17 @@ public class FifoRhymer extends DefaultCountingOutRhymer { @Override public int countOut() { while (!callCheck()) - temp.countIn(super.countOut()); + getTemp().countIn(super.countOut()); - int ret = temp.countOut(); + int ret = getTemp().countOut(); - while (!temp.callCheck()) - countIn(temp.countOut()); + while (!getTemp().callCheck()) + countIn(getTemp().countOut()); return ret; } + + public DefaultCountingOutRhymer 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 234d27c4..657da884 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -5,14 +5,22 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { private int totalRejected = 0; public int reportRejected() { - return totalRejected; + return getTotalRejected(); } @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) - totalRejected++; + setTotalRejected(getTotalRejected() + 1); 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/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 37dfcd4d..bcd9c913 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -7,17 +7,17 @@ public class IntLinkedList { private int i; public void push(int i) { - if (last == null) - last = new Node(i); + if (getLast() == null) + setLast(new Node(i)); else { - last.next = new Node(i); - last.next.prev = last; - last = last.next; + getLast().setNext(new Node(i)); + getLast().getNext().setPrev(getLast()); + setLast(getLast().getNext()); } } public boolean isEmpty() { - return last == null; + return getLast() == null; } public boolean isFull() { @@ -27,15 +27,30 @@ public boolean isFull() { public int top() { if (isEmpty()) return MIN; - return last.value; + return getLast().getValue(); } public int pop() { if (isEmpty()) return MIN; - int ret = last.value; - last = last.prev; + int ret = getLast().getValue(); + setLast(getLast().getPrev()); return ret; } + public Node getLast() { + return last; + } + + public void setLast(Node last) { + this.last = last; + } + + public int getI() { + return i; + } + + public void setI(int i) { + this.i = i; + } } 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 e1f66ebbcbe1af0808231f0464fbe0295d8fc0a2 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Mon, 27 May 2024 21:04:31 +0200 Subject: [PATCH 22/25] =?UTF-8?q?12.=20Usuwanie=20nieu=C5=BCywanych=20gett?= =?UTF-8?q?er=C3=B3w/setter=C3=B3w=20+=20Poprawa=20pliku=20DefaultContingO?= =?UTF-8?q?utRhymer?= 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/list/IntLinkedList.java | 7 ------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 803a9840..914b509e 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -19,17 +19,17 @@ public void countIn(int in) { } public boolean callCheck() { - return total == EMPTY; + return getTotal() == EMPTY; } public boolean isFull() { - return total == MAX_SIZE - 1; + return getTotal() == MAX_SIZE - 1; } protected int peekaboo() { if (callCheck()) return PEEKABOO_MIN; - return numbers[total]; + return numbers[getTotal()]; } public int countOut() { 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 bcd9c913..84341a03 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -46,11 +46,4 @@ public void setLast(Node last) { this.last = last; } - public int getI() { - return i; - } - - public void setI(int i) { - this.i = i; - } } From fa85b0ec730443c283fca483cb1b8c5dc9d04c99 Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Sun, 2 Jun 2024 22:58:59 +0200 Subject: [PATCH 23/25] 13. Utworzenie metody statycznej testRhymers --- .../java/edu/kis/vh/nursery/RhymersDemo.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 05aba9fa..891f95d2 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -9,27 +9,31 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - + + testRhymers(factory); + + } + + private static void testRhymers(Rhymersfactory factory) { defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), 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()); - } - + } \ No newline at end of file From b17ce0049c3caf2be11139e5b0ad923b3ccfafdd Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Sat, 8 Jun 2024 22:52:25 +0200 Subject: [PATCH 24/25] 17. Dodanie dokumentacji do wybranej klasy --- .../vh/nursery/DefaultCountingOutRhymer.java | 51 +++++++++++++++++-- .../{FifoRhymer.java => FIFORhymer.java} | 0 2 files changed, 48 insertions(+), 3 deletions(-) rename src/main/java/edu/kis/vh/nursery/{FifoRhymer.java => FIFORhymer.java} (100%) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 914b509e..085a88b0 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,37 +1,82 @@ package edu.kis.vh.nursery; +/** + * Klasa DefaultCountingOutRhymer implementuje licznik, który przechowuje + * elementy w tablicy o stałej wielkości. Ma takie opercje jak dodawanie elementu + * do tablicy, sprawdzenie czy licznik jest pusty lub pełny oraz podgląd + * ostatniego elementu i jego usuwanie z tablicy. + */ public class DefaultCountingOutRhymer { - + /** + * Wartość, która oznacza, że tablica jest pusta. + */ private static final int EMPTY = -1; + /** + * Wartość minimalna zwracana przez metodę peekaboo, gdy licznik jest pusty. + */ private static final int PEEKABOO_MIN = -1; + /** + * Rozmiar tablicy przechowującej elementy licznika. + */ private static final int MAX_SIZE = 12; + /** + * Tablica przechowująca elementy licznika. + */ private final int[] numbers = new int[MAX_SIZE]; + /** + * Indeks wskazujący na ostatni dodany element w tablicy + * z przypisaną wartością domyślną EMPTY. + */ + private int total = EMPTY; + /** + * Zwraca obecny indeks ostatniego elementu w liczniku. + * @return indeks ostatniego elementu + */ public int getTotal() { return total; } - private int total = EMPTY; - + /** + * Dodaje nowy element do tablicy. + * Przed dododwaniem sprawdza, czy tablica nie jest pełna + * @param in wartość dodawanego elementu + */ public void countIn(int in) { if (!isFull()) numbers[++total] = in; } + /** + * Sprawdza czy licznik jest pusty. + * @return true, jak licznik jest pusty, false w przeciwnym przypadku + */ public boolean callCheck() { return getTotal() == EMPTY; } + /** + * Sprawdza czy licznik jest pełny. + * @return true, jak licznik jest pełny, false w przeciwnym przypadku + */ public boolean isFull() { return getTotal() == MAX_SIZE - 1; } + /** + * Zwraca ostatni dodany element bez jego usuwania z tablicy. + * @return ostatni element w tablicy lub -1 (PEEKABOO_MIN) w przypadku pustej tablicy licznika + */ protected int peekaboo() { if (callCheck()) return PEEKABOO_MIN; return numbers[getTotal()]; } + /** + * Zwraca ostatni element z tablicy oraz usuwa go. + * @return osatni element w tablicy lub -1 (MIN) jeżeli tablica jest pusta + */ public int countOut() { if (callCheck()) return EMPTY; diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java similarity index 100% rename from src/main/java/edu/kis/vh/nursery/FifoRhymer.java rename to src/main/java/edu/kis/vh/nursery/FIFORhymer.java From 36648e138e977471179bc551f7c89b628869099e Mon Sep 17 00:00:00 2001 From: HannaSauchuk <248664@edu.p.lodz.pl> Date: Sat, 8 Jun 2024 23:04:04 +0200 Subject: [PATCH 25/25] =?UTF-8?q?18.=20Dodanie=20klas=C3=B3w=20z=20folderu?= =?UTF-8?q?=20test,=20bo=20przy=20zmianie=20przy=20poprawie=20nazw=20metod?= =?UTF-8?q?=20i=20klas=20tego=20nie=20zrobi=C5=82am=20(punkty=204.1=20i=20?= =?UTF-8?q?4.2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 12 ++++++------ .../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 2 files changed, 11 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 891f95d2..9db957d6 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,22 +1,22 @@ package edu.kis.vh.nursery; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +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(); testRhymers(factory); } - private static void testRhymers(Rhymersfactory factory) { - defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), - factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; + private static void testRhymers(RhymersFactory factory) { + DefaultCountingOutRhymer[] rhymers = { factory.getStandardRhymer(), factory.getFalseRhymer(), + factory.getFIFORhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) 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();