From aa1322d2a78a64c4c8d383635e0a5c2e00be7a1c Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 10:23:54 +0200 Subject: [PATCH 1/9] 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..409696d3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +/bin/ +/target/ +/.idea/ +*.class From 4561c0d0e6409489d538aa4d29953675c0c4d63d Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 10:26:51 +0200 Subject: [PATCH 2/9] 2. Poprawa formatowania w 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 c88be9ec5b9ed813b48c2410e0557fb1bc8724ed Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 10:55:07 +0200 Subject: [PATCH 3/9] =?UTF-8?q?3.=20scalenie=20ga=C5=82=C4=99zi=20format?= =?UTF-8?q?=20z=20ga=C5=82=C4=99zi=C4=85=20master?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 3fe25c026fa3849212be255cc1c893d9cf4556f1 Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 11:00:37 +0200 Subject: [PATCH 4/9] 4.1. Poprawa nazw klas. --- ...aultCountingOutRhymer.java => DefaultCountingOutRhymer.java} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (95%) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java similarity index 95% rename from src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java rename to src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 199abf6d..86977ddb 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]; From 6a8f71a9e2f68eaf17baa0ee56cc088bd70ca946 Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 11:01:16 +0200 Subject: [PATCH 5/9] 4.1. Poprawa nazw klas. --- .../vh/nursery/factory/DefaultRhymersFactory.java | 15 +++++++-------- 1 file changed, 7 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 60ba2a16..9f3a9638 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -1,29 +1,28 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; import edu.kis.vh.nursery.FIFORhymer; import edu.kis.vh.nursery.HanoiRhymer; -import edu.kis.vh.nursery.factory.Rhymersfactory; public class DefaultRhymersFactory implements Rhymersfactory { @Override - public defaultCountingOutRhymer GetStandardRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFalseRhymer() { - return new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer() { + return new DefaultCountingOutRhymer(); } @Override - public defaultCountingOutRhymer GetFIFORhymer() { + public DefaultCountingOutRhymer GetFIFORhymer() { return new FIFORhymer(); } @Override - public defaultCountingOutRhymer GetHanoiRhymer() { + public DefaultCountingOutRhymer GetHanoiRhymer() { return new HanoiRhymer(); } From 6338b9af8596edd585ce309a60349facf11cef2e Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 11:04:51 +0200 Subject: [PATCH 6/9] 4.1. Poprawa nazw klas. --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../edu/kis/vh/nursery/factory/Rhymersfactory.java | 10 +++++----- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 4 +--- src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 5 files changed, 14 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 28591ada..261201e3 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -1,8 +1,8 @@ package edu.kis.vh.nursery; -public class FIFORhymer extends defaultCountingOutRhymer { +public class FIFORhymer extends DefaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index ec0691fc..89ffa912 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { +public class HanoiRhymer extends DefaultCountingOutRhymer { int totalRejected = 0; diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java index 033755d0..0ec6cfc0 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java @@ -1,15 +1,15 @@ package edu.kis.vh.nursery.factory; -import edu.kis.vh.nursery.defaultCountingOutRhymer; +import edu.kis.vh.nursery.DefaultCountingOutRhymer; public interface Rhymersfactory { - public defaultCountingOutRhymer GetStandardRhymer(); + public DefaultCountingOutRhymer GetStandardRhymer(); - public defaultCountingOutRhymer GetFalseRhymer(); + public DefaultCountingOutRhymer GetFalseRhymer(); - public defaultCountingOutRhymer GetFIFORhymer(); + public DefaultCountingOutRhymer GetFIFORhymer(); - public defaultCountingOutRhymer GetHanoiRhymer(); + public DefaultCountingOutRhymer GetHanoiRhymer(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 05aba9fa..a1f89c7f 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,7 +1,5 @@ package edu.kis.vh.nursery; -import edu.kis.vh.nursery.defaultCountingOutRhymer; -import edu.kis.vh.nursery.HanoiRhymer; import edu.kis.vh.nursery.factory.DefaultRhymersFactory; import edu.kis.vh.nursery.factory.Rhymersfactory; @@ -10,7 +8,7 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), + DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; for (int i = 1; i < 15; i++) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index 144906eb..f0f88d99 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -7,7 +7,7 @@ public class RhymersJUnitTest { @Test public void testCountIn() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); int testValue = 4; rhymer.countIn(testValue); @@ -17,7 +17,7 @@ public void testCountIn() { @Test public void testCallCheck() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); boolean result = rhymer.callCheck(); Assert.assertEquals(true, result); @@ -29,7 +29,7 @@ public void testCallCheck() { @Test public void testIsFull() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int STACK_CAPACITY = 12; for (int i = 0; i < STACK_CAPACITY; i++) { boolean result = rhymer.isFull(); @@ -43,7 +43,7 @@ public void testIsFull() { @Test public void testPeekaboo() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.peekaboo(); @@ -60,7 +60,7 @@ public void testPeekaboo() { @Test public void testCountOut() { - defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); + DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); final int EMPTY_STACK_VALUE = -1; int result = rhymer.countOut(); From a83769e2f0ec9d31f124ab4b5477038221a48c42 Mon Sep 17 00:00:00 2001 From: vlad13376 <245106@edu.p.lodz.pl> Date: Sat, 11 May 2024 11:13:33 +0200 Subject: [PATCH 7/9] =?UTF-8?q?5.=20scalenie=20ga=C5=82=C4=99zi=20master?= =?UTF-8?q?=20z=20ga=C5=82=C4=99zi=C4=85=20class-method-naming?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 86977ddb..f5a38013 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,13 +2,13 @@ public class DefaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; + private int[] numbers = new int[12]; public int total = -1; public void countIn(int in) { if (!isFull()) - NUMBERS[++total] = in; + numbers[++total] = in; } public boolean callCheck() { @@ -22,13 +22,13 @@ public boolean isFull() { protected int peekaboo() { if (callCheck()) return -1; - return NUMBERS[total]; + return numbers[total]; } public int countOut() { if (callCheck()) return -1; - return NUMBERS[total--]; + return numbers[total--]; } } From 5e43e3643441c5497535cd278f409ad933b5a5d0 Mon Sep 17 00:00:00 2001 From: 245965 <245965@edu.p.lodz.pl> Date: Wed, 15 May 2024 19:11:02 +0200 Subject: [PATCH 8/9] =?UTF-8?q?Sta=C5=82e=20i=20anotacje?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vh/nursery/DefaultCountingOutRhymer.java | 20 +++++++++---------- .../java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../kis/vh/nursery/list/IntLinkedList.java | 4 ++-- .../java/edu/kis/vh/nursery/list/Node.java | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index f5a38013..e5016f3c 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,33 +1,33 @@ package edu.kis.vh.nursery; -public class DefaultCountingOutRhymer { - - private int[] numbers = new int[12]; - - public int total = -1; - +public class DefaultCountingOutRhymer { + public static final int ARRAY_S = 12; + public static final int DEFAULT_NEGATIVE_VALUE = -1; + public static final int ARRAY_S_PLUS_DEFAULT_NEGATIVE_VALUE = 11; + private int[] numbers = new int[ARRAY_S]; + public int total = DEFAULT_NEGATIVE_VALUE; public void countIn(int in) { if (!isFull()) numbers[++total] = in; } public boolean callCheck() { - return total == -1; + return total == DEFAULT_NEGATIVE_VALUE; } public boolean isFull() { - return total == 11; + return total ==ARRAY_S_PLUS_DEFAULT_NEGATIVE_VALUE; } protected int peekaboo() { if (callCheck()) - return -1; + return DEFAULT_NEGATIVE_VALUE; return numbers[total]; } public int countOut() { if (callCheck()) - return -1; + return DEFAULT_NEGATIVE_VALUE;; return numbers[total--]; } diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 261201e3..de9e4001 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,7 +2,7 @@ public class FIFORhymer extends DefaultCountingOutRhymer { - public DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + public final DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); @Override public int countOut() { diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 89ffa912..f2f2e5de 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -7,7 +7,7 @@ public class HanoiRhymer extends DefaultCountingOutRhymer { public int reportRejected() { return totalRejected; } - + @Override public void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 07efc0a2..12f4aea0 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -1,5 +1,5 @@ package edu.kis.vh.nursery.list; - +import static edu.kis.vh.nursery.DefaultCountingOutRhymer.DEFAULT_NEGATIVE_VALUE; public class IntLinkedList { Node last; @@ -31,7 +31,7 @@ public int top() { public int pop() { if (isEmpty()) - return -1; + return DEFAULT_NEGATIVE_VALUE; int ret = last.value; last = last.prev; 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 0a2cd75e..abd6bc5c 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 aafd2e098dfbc57f9f6bee1df6490710e6aa1f97 Mon Sep 17 00:00:00 2001 From: DanielKarolak <245838@edu.p.lodz.pl> Date: Wed, 5 Jun 2024 19:42:45 +0200 Subject: [PATCH 9/9] Zadanie 9,10,11,12 --- .../vh/nursery/DefaultCountingOutRhymer.java | 16 ++++++++++ .../java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../kis/vh/nursery/list/IntLinkedList.java | 32 +++++++++++++------ .../java/edu/kis/vh/nursery/list/Node.java | 25 +++++++++++++-- 5 files changed, 64 insertions(+), 13 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index e5016f3c..ea1dfb89 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -5,6 +5,22 @@ public class DefaultCountingOutRhymer { public static final int DEFAULT_NEGATIVE_VALUE = -1; public static final int ARRAY_S_PLUS_DEFAULT_NEGATIVE_VALUE = 11; private int[] numbers = new int[ARRAY_S]; + + public static int getArraySize() { + return ARRAY_SIZE; + } + + public static int getDefaultNegativeValue() { + return DEFAULT_NEGATIVE_VALUE; + } + + public static int getArraySizePlusDefaultNegativeValue() { + return ARRAY_SIZE_PLUS_DEFAULT_NEGATIVE_VALUE; + } + + public int getTotal() { + return total; + } public int total = DEFAULT_NEGATIVE_VALUE; public void countIn(int in) { if (!isFull()) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index de9e4001..f550cbc0 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 f2f2e5de..5293434c 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/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 12f4aea0..eeed7e2d 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -1,7 +1,9 @@ package edu.kis.vh.nursery.list; import static edu.kis.vh.nursery.DefaultCountingOutRhymer.DEFAULT_NEGATIVE_VALUE; public class IntLinkedList { - + private final int LINKED_LIST_DEFAULT_NEGATIVE_VALUE = -1; + private Node last; + private int i; Node last; int i; @@ -9,9 +11,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(); } } @@ -25,16 +27,28 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; - return last.value; + return LINKED_LIST_DEFAULT_NEGATIVE_VALUE; + return last.getValue(); } public int pop() { if (isEmpty()) - return DEFAULT_NEGATIVE_VALUE; - int ret = last.value; - last = last.prev; + return LINKED_LIST_DEFAULT_NEGATIVE_VALUE; + int ret = last.getValue(); + last = last.getPrev(); return ret; } + public int getLINKED_LIST_DEFAULT_NEGATIVE_VALUE() { + return LINKED_LIST_DEFAULT_NEGATIVE_VALUE; + } + + public Node getLast() { + return last; + } + + + public int getI() { + return 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 abd6bc5c..ab45934c 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,32 @@ public class Node { - public final int value; + private final int value; + private Node prev; + private Node next; public Node prev, 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; + } }