From 9d55ba0819bd9f0c8ffa24b5c157c0e4d9c5f986 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 14 Apr 2024 23:07:56 +0200 Subject: [PATCH 1/9] 1. Dodanie pliku gitginore --- .gitignore | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f59a85a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,78 @@ +/.idea +/target/ + + + +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser \ No newline at end of file From e3d8e21a311f0a92a6d9b4d993a385f497a52852 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 14 Apr 2024 23:09:56 +0200 Subject: [PATCH 2/9] =?UTF-8?q?2.=20Formatowaniekodu=20=C5=BAr=C3=B3d?= =?UTF-8?q?=C5=82owego=20Java=20w=20klasie=20=20=20=20HanoiRhymer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 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 f57c0ac031e9d51c472baafc8d69062b89c0106e Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 14 Apr 2024 23:42:25 +0200 Subject: [PATCH 3/9] 4.1 poprawa nazw klas --- ...mer.java => DefaultCountingOutRhymer.java} | 2 +- .../{FIFORhymer.java => FifoRhymer.java} | 4 ++-- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../factory/DefaultRhymersFactory.java | 19 +++++++++---------- .../vh/nursery/factory/Rhymersfactory.java | 10 +++++----- .../java/edu/kis/vh/nursery/RhymersDemo.java | 4 +--- .../edu/kis/vh/nursery/RhymersJUnitTest.java | 10 +++++----- 7 files changed, 24 insertions(+), 27 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (95%) rename src/main/java/edu/kis/vh/nursery/{FIFORhymer.java => FifoRhymer.java} (73%) 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]; diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java similarity index 73% rename from src/main/java/edu/kis/vh/nursery/FIFORhymer.java rename to src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 28591ada..3e972fc3 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/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 60ba2a16..cb42e845 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 { @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 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 80b4d08512cc69c9772f97a96d186fc6125157a5 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 14 Apr 2024 23:46:11 +0200 Subject: [PATCH 4/9] 4.2 zmiana konwencji nazewniczej 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 cb42e845..05f11199 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 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(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index a1f89c7f..b854e2ee 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.getFIFORhymer(), factory.getHanoiRhymer()}; for (int i = 1; i < 15; i++) for (int j = 0; j < 3; j++) From a08b1ad1068aae815948b7a8ffaa6e058816aea0 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 14 Apr 2024 23:52:17 +0200 Subject: [PATCH 5/9] =?UTF-8?q?5.1=20poprawa=20b=C5=82=C4=99d=C3=B3w=20kon?= =?UTF-8?q?wencji=20nazewniczej=20p=C3=B3l=20klas=20we=20=20=20=20=20wszys?= =?UTF-8?q?tkich=20klasach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kis/vh/nursery/defaultCountingOutRhymer.java | 8 ++++---- .../java/edu/kis/vh/nursery/RhymersJUnitTest.java | 14 +++++++------- 2 files changed, 11 insertions(+), 11 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..8e3454db 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--]; } } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index 144906eb..095edb3b 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -30,8 +30,8 @@ public void testCallCheck() { @Test public void testIsFull() { defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); - final int STACK_CAPACITY = 12; - for (int i = 0; i < STACK_CAPACITY; i++) { + final int stackCapacity = 12; + for (int i = 0; i < stackCapacity; i++) { boolean result = rhymer.isFull(); Assert.assertEquals(false, result); rhymer.countIn(888); @@ -44,10 +44,10 @@ public void testIsFull() { @Test public void testPeekaboo() { defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); - final int EMPTY_STACK_VALUE = -1; + final int emptyStackValue = -1; int result = rhymer.peekaboo(); - Assert.assertEquals(EMPTY_STACK_VALUE, result); + Assert.assertEquals(emptyStackValue, result); int testValue = 4; rhymer.countIn(testValue); @@ -61,10 +61,10 @@ public void testPeekaboo() { @Test public void testCountOut() { defaultCountingOutRhymer rhymer = new defaultCountingOutRhymer(); - final int EMPTY_STACK_VALUE = -1; + final int emptyStackValue = -1; int result = rhymer.countOut(); - Assert.assertEquals(EMPTY_STACK_VALUE, result); + Assert.assertEquals(emptyStackValue, result); int testValue = 4; rhymer.countIn(testValue); @@ -72,7 +72,7 @@ public void testCountOut() { result = rhymer.countOut(); Assert.assertEquals(testValue, result); result = rhymer.countOut(); - Assert.assertEquals(EMPTY_STACK_VALUE, result); + Assert.assertEquals(emptyStackValue, result); } } From 935ce98b65f396e0670fe093c470197f21bfbb2a Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Mon, 6 May 2024 11:25:08 +0200 Subject: [PATCH 6/9] poprawki --- .../vh/nursery/DefaultCountingOutRhymer.java | 38 +++++++++---------- .../java/edu/kis/vh/nursery/FifoRhymer.java | 16 ++++---- .../java/edu/kis/vh/nursery/RhymersDemo.java | 16 ++++---- 3 files changed, 35 insertions(+), 35 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..0c7e4e71 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/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 3e972fc3..5a88813e 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -3,19 +3,19 @@ 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/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index b854e2ee..41fadafb 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -7,27 +7,27 @@ 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++) 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 a0e9f32aedc67a8eadf128ca9f96afa7af8045e2 Mon Sep 17 00:00:00 2001 From: Timothy Kalejaiye Date: Mon, 6 May 2024 11:45:16 +0200 Subject: [PATCH 7/9] Replace variables with contants, add override to methods where necessary --- .../kis/vh/nursery/DefaultCountingOutRhymer.java | 11 +++++++---- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + .../edu/kis/vh/nursery/list/IntLinkedList.java | 2 +- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 14 +++++++++----- 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 0c7e4e71..287232ad 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 ARRAY_SIZE = 12; + public static final int TOTAL = -1; + private final int[] numbers = new int[ARRAY_SIZE]; + + public int total = TOTAL; - public int total = -1; public void countIn(int in) { if (!isFull()) @@ -12,11 +15,11 @@ public void countIn(int in) { } public boolean callCheck() { - return total == -1; + return total == TOTAL; } public boolean isFull() { - return total == 11; + return total == ARRAY_SIZE - 1; } protected int peekaboo() { diff --git a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java index 5a88813e..a56d6843 100644 --- a/src/main/java/edu/kis/vh/nursery/FifoRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FifoRhymer.java @@ -10,7 +10,7 @@ public int countOut() { temp.countIn(super.countOut()); - int ret = temp.countOut(); + final int ret = temp.countOut(); while (!temp.callCheck()) 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++; 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..9117056d 100644 --- a/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java +++ b/src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java @@ -32,7 +32,7 @@ public int top() { public int pop() { if (isEmpty()) return -1; - int ret = last.value; + final int ret = last.value; last = last.prev; return ret; } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 41fadafb..4b41ec12 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -5,19 +5,23 @@ class RhymersDemo { + public static final int RHYMERS_COUNT = 15; + public static final int RHYMERS_LAST_INDEX = 3; + public static final int MAX_RANGE = 20; + public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); DefaultCountingOutRhymer[] rhymers = {factory.getStandardRhymer(), factory.getFalseRhymer(), factory.getFIFORhymer(), factory.getHanoiRhymer()}; - for (int i = 1; i < 15; i++) - for (int j = 0; j < 3; j++) + for (int i = 1; i < RHYMERS_COUNT; i++) + for (int j = 0; j < RHYMERS_LAST_INDEX; 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 = 1; i < RHYMERS_COUNT; i++) + rhymers[RHYMERS_LAST_INDEX].countIn(rn.nextInt(MAX_RANGE)); for (int i = 0; i < rhymers.length; i++) { while (!rhymers[i].callCheck()) @@ -26,7 +30,7 @@ public static void main(String[] args) { } System.out.println("total rejected is " - + ((HanoiRhymer) rhymers[3]).reportRejected()); + + ((HanoiRhymer) rhymers[RHYMERS_LAST_INDEX]).reportRejected()); } From b636ec59a25e878977eefbea9bb1f6334a959242 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 19 May 2024 23:00:53 +0200 Subject: [PATCH 8/9] =?UTF-8?q?Zmiana=20modyfikator=C3=B3w=20private,publi?= =?UTF-8?q?c=20itd.=20Zastostowanie=20najmniejszej=20mo=C5=BCliwej=20widoc?= =?UTF-8?q?zno=C5=9Bci?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 10 +++++----- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 4 ++-- .../kis/vh/nursery/factory/DefaultRhymersFactory.java | 1 - .../edu/kis/vh/nursery/factory/Rhymersfactory.java | 8 ++++---- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 6 +++--- 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 287232ad..6124eb6e 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -6,19 +6,19 @@ public class DefaultCountingOutRhymer { public static final int TOTAL = -1; private final int[] numbers = new int[ARRAY_SIZE]; - public int total = TOTAL; + private int total = TOTAL; - public void countIn(int in) { + protected void countIn(int in) { if (!isFull()) numbers[++total] = in; } - public boolean callCheck() { + protected boolean callCheck() { return total == TOTAL; } - public boolean isFull() { + protected boolean isFull() { return total == ARRAY_SIZE - 1; } @@ -28,7 +28,7 @@ protected int peekaboo() { return numbers[total]; } - public int countOut() { + protected int countOut() { if (callCheck()) return -1; 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 a56d6843..4e1df679 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 DefaultCountingOutRhymer temp = new DefaultCountingOutRhymer(); + private 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 25ea2f84..acdc18d8 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/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 05f11199..2b8c8ea3 100644 --- a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java +++ b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java @@ -1,5 +1,4 @@ package edu.kis.vh.nursery.factory; - import edu.kis.vh.nursery.DefaultCountingOutRhymer; import edu.kis.vh.nursery.FifoRhymer; import edu.kis.vh.nursery.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 eedb9ba1..06acbbd1 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(); + DefaultCountingOutRhymer getStandardRhymer(); - public DefaultCountingOutRhymer getFalseRhymer(); + DefaultCountingOutRhymer getFalseRhymer(); - public DefaultCountingOutRhymer getFIFORhymer(); + DefaultCountingOutRhymer getFIFORhymer(); - public DefaultCountingOutRhymer getHanoiRhymer(); + 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 4b41ec12..6ee11a6e 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -5,9 +5,9 @@ class RhymersDemo { - public static final int RHYMERS_COUNT = 15; - public static final int RHYMERS_LAST_INDEX = 3; - public static final int MAX_RANGE = 20; + private static final int RHYMERS_COUNT = 15; + private static final int RHYMERS_LAST_INDEX = 3; + private static final int MAX_RANGE = 20; public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); From 3a845ef4b5d3e0a5267f92924d3facd63f0c8e42 Mon Sep 17 00:00:00 2001 From: bkapturowski Date: Sun, 19 May 2024 23:14:19 +0200 Subject: [PATCH 9/9] =?UTF-8?q?Generacja=20getter=20dla=20pola=20total=20w?= =?UTF-8?q?=20klasie=20DefaultCountingOutRhymer=20i=20hermetyzacja=20niepr?= =?UTF-8?q?ywatnych=20atrybut=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../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 6124eb6e..ed3d71ef 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,6 +2,10 @@ public class DefaultCountingOutRhymer { + public int getTotal() { + return total; + } + public static final int ARRAY_SIZE = 12; public static final int TOTAL = -1; private final int[] numbers = new int[ARRAY_SIZE];