From 204f077696413dcda834de87035ae696c8f193eb Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Sun, 12 May 2024 12:45:49 +0200 Subject: [PATCH 01/15] 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..ed6b2d80 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.idea/ +target/ +bin/ From 39e94d34d9a1739c98d746dff53838b1ddece4e3 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Sun, 12 May 2024 13:01:43 +0200 Subject: [PATCH 02/15] 2. poprawione formatowanie kodu w klasie HanoiRhymer --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 755b2d58..7d324d00 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 41548810eded1429daf68245a5a7cbe74cadd796 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:07:29 +0200 Subject: [PATCH 03/15] 4.1 Poprawa nazw klas --- .../vh/nursery/factory/DefaultRhymersFactory.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 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..9d738ef2 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -1,6 +1,6 @@ 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; @@ -8,22 +8,22 @@ 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 ea70f9d35c4a8ac691ead6321d999c1d4183987c Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:08:41 +0200 Subject: [PATCH 04/15] 4.1 Poprawa nazw klas --- .../edu/kis/vh/nursery/factory/Rhymersfactory.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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(); } From 42ad5700b3e58bf2ef3dc3348ce97ff3e2dd859c Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:09:22 +0200 Subject: [PATCH 05/15] 4.1 Poprawa nazw klas --- 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 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 3a82d10e43442313d7e0684a9feea59946d57e1c Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:09:55 +0200 Subject: [PATCH 06/15] 4.1 Poprawa nazw klas --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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..13821a35 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() { From 06734dfb052150e5f191c0db1d303cb0fba15e66 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:10:31 +0200 Subject: [PATCH 07/15] 4.1 Poprawa nazw klas --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 7d324d00..bf4d2536 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; From 2215bc071e4dd9b29196046dd487979a2c0d9c78 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:12:01 +0200 Subject: [PATCH 08/15] 4.2 Poprawa nazw metod --- .../edu/kis/vh/nursery/factory/DefaultRhymersFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 9d738ef2..075cd52c 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -8,22 +8,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(); } From 37a3c112ccd13b5f77328cccb987f42dc7a5ce3f Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:12:33 +0200 Subject: [PATCH 09/15] 4.2 Poprawa nazw metod --- .../java/edu/kis/vh/nursery/factory/Rhymersfactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 0ec6cfc0..eedb9ba1 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 d076e65915087d4eada01697205859e4327301a6 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:13:22 +0200 Subject: [PATCH 10/15] 4.2 Poprawa nazw metod --- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java index 07efc0a2..3e86df49 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,14 +2,14 @@ public class IntLinkedList { - Node last; + node last; int i; public void push(int i) { if (last == null) - last = new Node(i); + last = new node(i); else { - last.next = new Node(i); + last.next = new node(i); last.next.prev = last; last = last.next; } From 1456fbb67a12799d86fc178d115bc69198dc9047 Mon Sep 17 00:00:00 2001 From: klaudiakudaj <117376601+klaudiakudaj@users.noreply.github.com> Date: Mon, 13 May 2024 11:14:37 +0200 Subject: [PATCH 11/15] 4.1 Poprawa nazw klas --- src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 3e86df49..07efc0a2 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,14 +2,14 @@ public class IntLinkedList { - node last; + Node last; int i; public void push(int i) { if (last == null) - last = new node(i); + last = new Node(i); else { - last.next = new node(i); + last.next = new Node(i); last.next.prev = last; last = last.next; } From 7175aa6cfffc1f0d7abb7b4443c4d34aa72dee58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Sun, 19 May 2024 14:00:12 +0200 Subject: [PATCH 12/15] =?UTF-8?q?6=20zast=C4=85pienie=20litera=C5=82=C3=B3?= =?UTF-8?q?w=20deklaracjami=20sta=C5=82ych?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/defaultCountingOutRhymer.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 199abf6d..caa6dbee 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 minusOne = -1; + public static final int eleven = 11; + public static final int numLength = 12; + private int[] NUMBERS = new int[numLength]; - public int total = -1; + public int total = minusOne; public void countIn(int in) { if (!isFull()) @@ -12,22 +15,22 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == minusOne; } public boolean isFull() { - return total == 11; + return total == eleven; } protected int peekaboo() { if (callCheck()) - return -1; + return minusOne; return NUMBERS[total]; } public int countOut() { if (callCheck()) - return -1; + return minusOne; return NUMBERS[total--]; } From f51c7c878982f24d96ef943defe79ebea6746693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Sun, 19 May 2024 14:03:38 +0200 Subject: [PATCH 13/15] 7 Ustawienie modyfikator final przy niemutowalnych atrybutach klas --- 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 28591ada..0679cb50 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 3c62b46a9c089e054d44d0d2ea1d40fe6d50ea84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82?= Date: Sun, 19 May 2024 14:09:47 +0200 Subject: [PATCH 14/15] =?UTF-8?q?8=20U=C5=BCycie=20annotacji=20@Override?= =?UTF-8?q?=20przy=20metodach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 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 7d324d00..fbf6f5b7 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 de4edd8774efb13cfe495475e1461f52762b730c Mon Sep 17 00:00:00 2001 From: Filip Barszczyk <245764@edu.p.lodz.pl> Date: Mon, 27 May 2024 15:40:35 +0200 Subject: [PATCH 15/15] Zadanie rownolegle --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 4 +-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 4 +-- .../vh/nursery/defaultCountingOutRhymer.java | 17 ++++++---- .../kis/vh/nursery/list/IntLinkedList.java | 16 +++++----- .../java/edu/kis/vh/nursery/list/Node.java | 31 +++++++++++++++++-- 5 files changed, 51 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 0679cb50..559e06cc 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,10 +2,10 @@ public class FIFORhymer extends defaultCountingOutRhymer { - public final defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + private final defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); @Override - public int countOut() { + protected int countOut() { while (!callCheck()) temp.countIn(super.countOut()); diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index fbf6f5b7..5ab518e8 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -4,12 +4,12 @@ public class HanoiRhymer extends defaultCountingOutRhymer { int totalRejected = 0; - public int reportRejected() { + protected int reportRejected() { return totalRejected; } @Override - public void countIn(int in) { + protected void countIn(int in) { if (!callCheck() && in > peekaboo()) totalRejected++; else diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index caa6dbee..d2460ae0 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,19 +2,24 @@ public class defaultCountingOutRhymer { - public static final int minusOne = -1; - public static final int eleven = 11; - public static final int numLength = 12; + private static final int minusOne = -1; + private static final int eleven = 11; + private static final int numLength = 12; private int[] NUMBERS = new int[numLength]; + public int getTotal() { + return total; + } + + public int total = minusOne; - public void countIn(int in) { + protected void countIn(int in) { if (!isFull()) NUMBERS[++total] = in; } - public boolean callCheck() { + protected boolean callCheck() { return total == minusOne; } @@ -28,7 +33,7 @@ protected int peekaboo() { return NUMBERS[total]; } - public int countOut() { + protected int countOut() { if (callCheck()) return minusOne; 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..c4d5f165 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -2,16 +2,16 @@ public class IntLinkedList { - Node last; - int i; + private Node last; + private int i; 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(); } } @@ -26,14 +26,14 @@ public boolean isFull() { public int top() { if (isEmpty()) return -1; - return last.value; + return last.getValue(); } public int pop() { if (isEmpty()) return -1; - int ret = last.value; - last = last.prev; + int ret = last.getValue(); + last = last.getPrev(); return ret; } diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java index 0a2cd75e..404c7d09 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,36 @@ public class Node { - public int value; - public Node prev, next; + + + private int value; + private Node prev, next; public Node(int i) { value = i; } - + public int getValue() { + return value; + } + + public Node getPrev() { + return prev; + } + + public Node getNext() { + return next; + } + + public void setValue(int value) { + this.value = value; + } + + public void setPrev(Node prev) { + this.prev = prev; + } + + public void setNext(Node next) { + this.next = next; + } } +