From 96e0dd4490ee8e6fbad3995d427aeea581e32771 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:00:07 +0200 Subject: [PATCH 01/14] 1. dodanie .gitignore --- .gitignore | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a5c3e29 --- /dev/null +++ b/.gitignore @@ -0,0 +1,60 @@ +.metadata +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.recommenders + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# PyDev specific (Python IDE for Eclipse) +*.pydevproject + +# CDT-specific (C/C++ Development Tooling) +.cproject + +# CDT- autotools +.autotools + +# Java annotation processor (APT) +.factorypath + +# PDT-specific (PHP Development Tools) +.buildpath + +# sbteclipse plugin +.target + +# Tern plugin +.tern-project + +# TeXlipse plugin +.texlipse + +# STS (Spring Tool Suite) +.springBeans + +# Code Recommenders +.recommenders/ + +# Annotation Processing +.apt_generated/ +.apt_generated_test/ + +# Scala IDE specific (Scala & Java development for Eclipse) +.cache-main +.scala_dependencies +.worksheet + +# Uncomment this line if you wish to ignore the project description file. +# Typically, this file would be tracked if it contains build/dependency configurations: +#.project \ No newline at end of file From 99e51cb73c62ca968c67dbe2f6aa3920ba5b9366 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:02:53 +0200 Subject: [PATCH 02/14] 2. formatowanie klas --- .classpath | 27 +++++++++ .gitignore | 3 +- .project | 23 ++++++++ .../java/edu/kis/vh/nursery/FIFORhymer.java | 32 +++++------ .../java/edu/kis/vh/nursery/HanoiRhymer.java | 10 ++-- .../vh/nursery/defaultCountingOutRhymer.java | 56 +++++++++---------- 6 files changed, 101 insertions(+), 50 deletions(-) create mode 100644 .classpath create mode 100644 .project diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..5e8a55f --- /dev/null +++ b/.classpath @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gitignore b/.gitignore index a5c3e29..a5a722c 100644 --- a/.gitignore +++ b/.gitignore @@ -57,4 +57,5 @@ local.properties # Uncomment this line if you wish to ignore the project description file. # Typically, this file would be tracked if it contains build/dependency configurations: -#.project \ No newline at end of file +#.project +/target/ diff --git a/.project b/.project new file mode 100644 index 0000000..1d8d7bc --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + powp-rhymers + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 28591ad..f90115e 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,20 +2,20 @@ public class FIFORhymer extends defaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); - - @Override - public int countOut() { - while (!callCheck()) - - temp.countIn(super.countOut()); - - int ret = temp.countOut(); - - while (!temp.callCheck()) - - countIn(temp.countOut()); - - return ret; - } + public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + + @Override + public int countOut() { + while (!callCheck()) + + temp.countIn(super.countOut()); + + int ret = temp.countOut(); + + while (!temp.callCheck()) + + countIn(temp.countOut()); + + return ret; + } } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 755b2d5..39f13e0 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); } -} +} \ No newline at end of file diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 199abf6..f904a86 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,33 +2,33 @@ public class defaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; - - public int total = -1; - - public void countIn(int in) { - if (!isFull()) - 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--]; - } + private int[] NUMBERS = new int[12]; + + public int total = -1; + + public void countIn(int in) { + if (!isFull()) + 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--]; + } } From 213c56bf78f7a8e8ceee87006bc5a095879803b9 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:15:57 +0200 Subject: [PATCH 03/14] =?UTF-8?q?5.=20poprawa=20nazw=20p=C3=B3l?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 10 +++++----- .../edu/kis/vh/nursery/defaultCountingOutRhymer.java | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index f90115e..f7f5def 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -2,19 +2,19 @@ public class FIFORhymer extends defaultCountingOutRhymer { - public defaultCountingOutRhymer temp = new defaultCountingOutRhymer(); + public defaultCountingOutRhymer internalRhymer = new defaultCountingOutRhymer(); @Override public int countOut() { while (!callCheck()) - temp.countIn(super.countOut()); + internalRhymer.countIn(super.countOut()); - int ret = temp.countOut(); + int ret = internalRhymer.countOut(); - while (!temp.callCheck()) + while (!internalRhymer.callCheck()) - countIn(temp.countOut()); + countIn(internalRhymer.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 f904a86..15b332c 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 f74a3baeaa9143e8419bbb438fabea107a42dc5e Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:06:24 +0200 Subject: [PATCH 04/14] =?UTF-8?q?5.=20rozwi=C4=85zanie=20konfliktu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/edu/kis/vh/nursery/FIFORhymer.java | 2 +- .../java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../vh/nursery/defaultCountingOutRhymer.java | 2 +- .../nursery/factory/DefaultRhymersFactory.java | 18 +++++++++--------- .../kis/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(+), 24 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index f7f5def..d23986c 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -1,6 +1,6 @@ package edu.kis.vh.nursery; -public class FIFORhymer extends defaultCountingOutRhymer { +public class FifoRhymer extends DefaultCountingOutRhymer { public defaultCountingOutRhymer internalRhymer = new defaultCountingOutRhymer(); diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 39f13e0..241447b 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 15b332c..2ff24bf 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 60ba2a1..82549fa 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,29 @@ 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 033755d..0ec6cfc 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 05aba9f..ec41274 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,6 +1,6 @@ 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; @@ -10,7 +10,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 144906e..f0f88d9 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 ce67631f22c270ea157dfd5ba0ce1e8c213f5018 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:10:27 +0200 Subject: [PATCH 05/14] =?UTF-8?q?5.=20rozwi=C4=85zywanie=20konfilktu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/FIFORhymer.java | 4 ++-- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- .../java/edu/kis/vh/nursery/defaultCountingOutRhymer.java | 6 +++--- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 2 +- src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index d23986c..933a47e 100644 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java @@ -6,13 +6,13 @@ public class FifoRhymer extends DefaultCountingOutRhymer { @Override public int countOut() { - while (!callCheck()) + while (!isEmpty()) internalRhymer.countIn(super.countOut()); int ret = internalRhymer.countOut(); - while (!internalRhymer.callCheck()) + while (!internalRhymer.isEmpty()) countIn(internalRhymer.countOut()); diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 241447b..3bde2cc 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 (!isEmpty() && in > peekaboo()) totalRejected++; else super.countIn(in); diff --git a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java index 2ff24bf..f42f3d0 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -11,7 +11,7 @@ public void countIn(int in) { numbers[++total] = in; } - public boolean callCheck() { + public boolean isEmpty() { return total == -1; } @@ -20,13 +20,13 @@ public boolean isFull() { } protected int peekaboo() { - if (callCheck()) + if (isEmpty()) return -1; return numbers[total]; } public int countOut() { - if (callCheck()) + if (isEmpty()) return -1; return numbers[total--]; } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index ec41274..af298c5 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -22,7 +22,7 @@ public static void main(String[] args) { rhymers[3].countIn(rn.nextInt(20)); for (int i = 0; i < rhymers.length; i++) { - while (!rhymers[i].callCheck()) + while (!rhymers[i].isEmpty()) System.out.print(rhymers[i].countOut() + " "); System.out.println(); } diff --git a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java index f0f88d9..3f97c4a 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersJUnitTest.java @@ -18,12 +18,12 @@ public void testCountIn() { @Test public void testCallCheck() { DefaultCountingOutRhymer rhymer = new DefaultCountingOutRhymer(); - boolean result = rhymer.callCheck(); + boolean result = rhymer.isEmpty(); Assert.assertEquals(true, result); rhymer.countIn(888); - result = rhymer.callCheck(); + result = rhymer.isEmpty(); Assert.assertEquals(false, result); } From 6aefc39a8b07739aabcbec53c22ace9bd010b186 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 04:32:30 +0200 Subject: [PATCH 06/14] =?UTF-8?q?rozwi=C4=85zywanie=20konflikt=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...efaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} | 0 .../java/edu/kis/vh/nursery/{FIFORhymer.java => FifoRhymer.java} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/edu/kis/vh/nursery/{defaultCountingOutRhymer.java => DefaultCountingOutRhymer.java} (100%) 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 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 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 4e94c751f5e25b92be6fdd1d8cf7c921a6c37436 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 14:55:35 +0200 Subject: [PATCH 07/14] =?UTF-8?q?modyfikatory=20widoczno=C5=9Bci=20w=20kla?= =?UTF-8?q?sach?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/FifoRhymer.java | 2 +- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index f42f3d0..573186d 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -4,7 +4,7 @@ public class DefaultCountingOutRhymer { private int[] numbers = new int[12]; - public int total = -1; + private int total = -1; 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 933a47e..78f7041 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 internalRhymer = new defaultCountingOutRhymer(); + private DefaultCountingOutRhymer internalRhymer = 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 3bde2cc..8e32c77 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; From a929e203b10a7c65581666ff1f6eac2598ff7778 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 14:58:01 +0200 Subject: [PATCH 08/14] getter dla pola total klasy DefaultCountingOutRhymer --- .../java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 573186d..d434d8c 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -6,6 +6,10 @@ public class DefaultCountingOutRhymer { private int total = -1; + public int getTotal() { + return total; + } + public void countIn(int in) { if (!isFull()) numbers[++total] = in; From b4e3aa18f898d20db568afacf6b9bc28e8e736ad Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 15:03:44 +0200 Subject: [PATCH 09/14] =?UTF-8?q?enkapsulacja=20p=C3=B3l=20klasy=20Default?= =?UTF-8?q?CountingOutRhymer?= 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, 8 insertions(+) diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index d434d8c..a73408f 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -35,4 +35,12 @@ public int countOut() { return numbers[total--]; } + private int[] getNumbers() { + return numbers; + } + + private void setNumbers(int[] numbers) { + this.numbers = numbers; + } + } From dc8d382d07397e83d5073288f6ad32dd35872e7d Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 19 Apr 2023 15:05:40 +0200 Subject: [PATCH 10/14] =?UTF-8?q?usuni=C4=99cie=20nieu=C5=BCywanych=20gett?= =?UTF-8?q?er=C3=B3w=20i=20setter=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 9 --------- 1 file changed, 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 a73408f..61a3443 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -34,13 +34,4 @@ public int countOut() { return -1; return numbers[total--]; } - - private int[] getNumbers() { - return numbers; - } - - private void setNumbers(int[] numbers) { - this.numbers = numbers; - } - } From 15f57a6d76c992d27981e280380aabc60bfe6931 Mon Sep 17 00:00:00 2001 From: sebastiangac Date: Tue, 9 May 2023 18:08:51 +0200 Subject: [PATCH 11/14] zmiany wprowadzone w punkcie 6 i 7 --- .idea/.gitignore | 8 ++++++++ .idea/modules.xml | 8 ++++++++ .idea/pio_git_rhymers_23.iml | 9 +++++++++ .idea/vcs.xml | 6 ++++++ .../edu/kis/vh/nursery/DefaultCountingOutRhymer.java | 12 +++++++----- src/main/java/edu/kis/vh/nursery/HanoiRhymer.java | 1 + 6 files changed, 39 insertions(+), 5 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/modules.xml create mode 100644 .idea/pio_git_rhymers_23.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..64e259c --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/pio_git_rhymers_23.iml b/.idea/pio_git_rhymers_23.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/pio_git_rhymers_23.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java index 61a3443..c92e34d 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -2,9 +2,11 @@ public class DefaultCountingOutRhymer { - private int[] numbers = new int[12]; + public static final int NUMBER = 12; + public static final int NEGATIVE = -1; + private int[] numbers = new int[NUMBER]; - private int total = -1; + private int total = NEGATIVE; public int getTotal() { return total; @@ -16,7 +18,7 @@ public void countIn(int in) { } public boolean isEmpty() { - return total == -1; + return total == NEGATIVE; } public boolean isFull() { @@ -25,13 +27,13 @@ public boolean isFull() { protected int peekaboo() { if (isEmpty()) - return -1; + return NEGATIVE; return numbers[total]; } public int countOut() { if (isEmpty()) - return -1; + return NEGATIVE; return numbers[total--]; } } diff --git a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java index 8e32c77..9f6ae48 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 (!isEmpty() && in > peekaboo()) totalRejected++; From b0d0113c396b52f2d641f9ee595d3cb1cf638bb8 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Tue, 23 May 2023 23:10:17 +0200 Subject: [PATCH 12/14] utworzenie metody testRhymers --- src/test/java/edu/kis/vh/nursery/RhymersDemo.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index af298c5..32d58da 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -10,7 +10,12 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), + testRhymers(factory); + + } + + public static void testRhymers(Rhymersfactory factory) { + DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; for (int i = 1; i < 15; i++) @@ -29,7 +34,6 @@ public static void main(String[] args) { System.out.println("total rejected is " + ((HanoiRhymer) rhymers[3]).reportRejected()); - - } + } } \ No newline at end of file From b814f3c5774cc9ecff969d6edd21c69383d9295b Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Tue, 23 May 2023 23:42:35 +0200 Subject: [PATCH 13/14] dodanie dokumentacji do klasy DefaultCountingOutRhymer --- .../vh/nursery/DefaultCountingOutRhymer.java | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 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 c92e34d..a575639 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,5 +1,9 @@ package edu.kis.vh.nursery; +/** + * @author 240827 + * Default rhymer that works similarly to a stack. + */ public class DefaultCountingOutRhymer { public static final int NUMBER = 12; @@ -8,29 +12,53 @@ public class DefaultCountingOutRhymer { private int total = NEGATIVE; + /** + * @return How many numbers have been added to the rhymer so far. + */ public int getTotal() { return total; } + /** + * Adds number specified in in argument to the rhymer. + * The in argument is not added if the rhymer is full. + * @param in + */ public void countIn(int in) { if (!isFull()) numbers[++total] = in; } + /** + * @return boolean value indicating if the rhymer is empty. + */ public boolean isEmpty() { return total == NEGATIVE; } + /** + * @return boolean value indicating if the rhymer is full. + */ public boolean isFull() { return total == 11; } - protected int peekaboo() { + /** + * Returns at the top of the rhymer. + * If the rhymer is empty, NEGATIVE is returned. + * @return value at the top of the rhymer. + */ + protected int peekaboo() { if (isEmpty()) return NEGATIVE; return numbers[total]; } + /** + * Returns value at the top of the rhymer and removes it from the rhymer. + * If the rhymer is empty, NEGATIVE is returned. + * @return value at the top of the rhymer. + */ public int countOut() { if (isEmpty()) return NEGATIVE; From 33df8e54c7ecfc2191da251fb5b546e18b136c76 Mon Sep 17 00:00:00 2001 From: 240827 <240827@edu.p.lodz.pl> Date: Wed, 24 May 2023 01:07:08 +0200 Subject: [PATCH 14/14] Squashed commit of the following: commit b814f3c5774cc9ecff969d6edd21c69383d9295b Author: 240827 <240827@edu.p.lodz.pl> Date: Tue May 23 23:42:35 2023 +0200 dodanie dokumentacji do klasy DefaultCountingOutRhymer commit b0d0113c396b52f2d641f9ee595d3cb1cf638bb8 Author: 240827 <240827@edu.p.lodz.pl> Date: Tue May 23 23:10:17 2023 +0200 utworzenie metody testRhymers --- .../vh/nursery/DefaultCountingOutRhymer.java | 30 ++++++++++++++++++- .../java/edu/kis/vh/nursery/RhymersDemo.java | 10 +++++-- 2 files changed, 36 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 c92e34d..a575639 100644 --- a/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -1,5 +1,9 @@ package edu.kis.vh.nursery; +/** + * @author 240827 + * Default rhymer that works similarly to a stack. + */ public class DefaultCountingOutRhymer { public static final int NUMBER = 12; @@ -8,29 +12,53 @@ public class DefaultCountingOutRhymer { private int total = NEGATIVE; + /** + * @return How many numbers have been added to the rhymer so far. + */ public int getTotal() { return total; } + /** + * Adds number specified in in argument to the rhymer. + * The in argument is not added if the rhymer is full. + * @param in + */ public void countIn(int in) { if (!isFull()) numbers[++total] = in; } + /** + * @return boolean value indicating if the rhymer is empty. + */ public boolean isEmpty() { return total == NEGATIVE; } + /** + * @return boolean value indicating if the rhymer is full. + */ public boolean isFull() { return total == 11; } - protected int peekaboo() { + /** + * Returns at the top of the rhymer. + * If the rhymer is empty, NEGATIVE is returned. + * @return value at the top of the rhymer. + */ + protected int peekaboo() { if (isEmpty()) return NEGATIVE; return numbers[total]; } + /** + * Returns value at the top of the rhymer and removes it from the rhymer. + * If the rhymer is empty, NEGATIVE is returned. + * @return value at the top of the rhymer. + */ public int countOut() { if (isEmpty()) return NEGATIVE; diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index af298c5..32d58da 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -10,7 +10,12 @@ class RhymersDemo { public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); - DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), + testRhymers(factory); + + } + + public static void testRhymers(Rhymersfactory factory) { + DefaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; for (int i = 1; i < 15; i++) @@ -29,7 +34,6 @@ public static void main(String[] args) { System.out.println("total rejected is " + ((HanoiRhymer) rhymers[3]).reportRejected()); - - } + } } \ No newline at end of file