diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/pio_git_rhymers-master/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java b/pio_git_rhymers-master/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java index 28591ada..da963e87 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 tempRhymer = new defaultCountingOutRhymer(); @Override public int countOut() { while (!callCheck()) - temp.countIn(super.countOut()); + tempRhymer.countIn(super.countOut()); - int ret = temp.countOut(); + int ret = tempRhymer.countOut(); - while (!temp.callCheck()) + while (!tempRhymer.callCheck())a - countIn(temp.countOut()); + countIn(tempRhymer.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 755b2d58..1146c708 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; + private int rejectedCount = 0; public int reportRejected() { - return totalRejected; + return rejectedCount; } public void countIn(int in) { - if (!callCheck() && in > peekaboo()) - totalRejected++; - else - super.countIn(in); + if (!callCheck() && in > peekaboo()) + rejectedCount++; + 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 199abf6d..e56f256a 100644 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java @@ -2,33 +2,32 @@ public class defaultCountingOutRhymer { - private int[] NUMBERS = new int[12]; + private int[] numbers = new int[12]; - public int total = -1; + private int total = -1; public void countIn(int in) { if (!isFull()) - NUMBERS[++total] = in; + numbers[++total] = in; } - public boolean callCheck() { - return total == -1; - } - - public boolean isFull() { - return total == 11; - } - - protected int peekaboo() { - if (callCheck()) - return -1; - return NUMBERS[total]; - } - - public int countOut() { - if (callCheck()) - return -1; - return NUMBERS[total--]; - } + public boolean callCheck() { + return total == -1; + } + + public boolean isFull() { + return total == 11; + } + protected int peekaboo() { + if (callCheck()) + return -1; + return numbers[total]; + } + + public int countOut() { + if (callCheck()) + return -1; + return numbers[total--]; + } } diff --git a/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java b/src/main/java/edu/kis/vh/nursery/factory/DefaultRhymersFactory.java index 60ba2a16..e0d48c8c 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(); } 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..dee8bee5 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 05aba9fa..ec91186c 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -5,14 +5,17 @@ import edu.kis.vh.nursery.factory.DefaultRhymersFactory; import edu.kis.vh.nursery.factory.Rhymersfactory; +//wygenerowano szkielet dokumentacji class RhymersDemo { - public static void main(String[] args) { + public static void main(String[] args) { Rhymersfactory factory = new DefaultRhymersFactory(); + 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++) for (int j = 0; j < 3; j++) rhymers[j].countIn(i);