diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..3a421819 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/.idea/ +/target/ +/bin/ \ 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 new file mode 100644 index 00000000..42953049 --- /dev/null +++ b/src/main/java/edu/kis/vh/nursery/DefaultCountingOutRhymer.java @@ -0,0 +1,60 @@ +package edu.kis.vh.nursery; +/* + The DefaultCountingOutRhymer class is used to count out rhymers. +*/ +public class DefaultCountingOutRhymer { + private static final int EMPTY = -1; + private final int MAX_SIZE = 12; + private final int FULL = MAX_SIZE - 1; + + private static final int DEFAULT = -1; + + + private final int[] numbers = new int[MAX_SIZE]; + /* + getTotal method returns value of elements in array numbers. + variable total is a number of rhymers in array. + */ + public int getTotal() { + return total; + } + + private int total = EMPTY; + /* + countIn method inserts value into numbers array after the last element, if array isn't full. + argument in is a value that will be inserted into array as the next element. + */ + public void countIn(int in) { + if (!isFull()) + numbers[++total] = in; + } + /* + callCheck is a method that returns true, if array number is empty, otherwise returns false. + */ + public boolean callCheck() { + return total == DEFAULT; + } + /* + isFull is a method that returns true, if array number is full. + */ + public boolean isFull() { + return total == FULL; + } + /* + peekaboo is a method that returns value of the last inserted element into number's array, if array isn't empty, otherwise returns DEFAULT value. + */ + protected int peekaboo() { + if (callCheck()) + return DEFAULT; + return numbers[total]; + } + /* + countOut method is returning last inserted elements and reduce last element, if array numbers isn't empty, otherwise returns EMPTY value. + */ + public int countOut() { + if (callCheck()) + return EMPTY; + 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 deleted file mode 100644 index 28591ada..00000000 --- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java +++ /dev/null @@ -1,21 +0,0 @@ -package edu.kis.vh.nursery; - -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; - } -} diff --git a/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java new file mode 100644 index 00000000..172c75a9 --- /dev/null +++ b/src/main/java/edu/kis/vh/nursery/FirstInFirstOutRhymer.java @@ -0,0 +1,19 @@ +package edu.kis.vh.nursery; + +public class FirstInFirstOutRhymer extends DefaultCountingOutRhymer { + + private final 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 755b2d58..234d27c4 100644 --- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java +++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java @@ -1,17 +1,18 @@ package edu.kis.vh.nursery; -public class HanoiRhymer extends defaultCountingOutRhymer { +public class HanoiRhymer extends DefaultCountingOutRhymer { -int totalRejected = 0; + private int totalRejected = 0; public int reportRejected() { return totalRejected; } + @Override public void countIn(int in) { - if (!callCheck() && in > peekaboo()) + if (!callCheck() && in > peekaboo()) totalRejected++; - else - super.countIn(in); + 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 deleted file mode 100644 index 199abf6d..00000000 --- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java +++ /dev/null @@ -1,34 +0,0 @@ -package edu.kis.vh.nursery; - -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--]; - } - -} 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..77fcd5bf 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.FirstInFirstOutRhymer; import edu.kis.vh.nursery.HanoiRhymer; -import edu.kis.vh.nursery.factory.Rhymersfactory; -public class DefaultRhymersFactory implements 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 getFirtsInFirstOutRhymer() { + return new FirstInFirstOutRhymer(); } @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 new file mode 100644 index 00000000..067445de --- /dev/null +++ b/src/main/java/edu/kis/vh/nursery/factory/RhymersFactory.java @@ -0,0 +1,15 @@ +package edu.kis.vh.nursery.factory; + +import edu.kis.vh.nursery.DefaultCountingOutRhymer; + +public interface RhymersFactory { + + public DefaultCountingOutRhymer getStandardRhymer(); + + public DefaultCountingOutRhymer getFalseRhymer(); + + public DefaultCountingOutRhymer getFirtsInFirstOutRhymer(); + + public DefaultCountingOutRhymer getHanoiRhymer(); + +} diff --git a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java b/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java deleted file mode 100644 index 033755d0..00000000 --- a/src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java +++ /dev/null @@ -1,15 +0,0 @@ -package edu.kis.vh.nursery.factory; - -import edu.kis.vh.nursery.defaultCountingOutRhymer; - - public interface Rhymersfactory { - - public defaultCountingOutRhymer GetStandardRhymer(); - - public defaultCountingOutRhymer GetFalseRhymer(); - - public defaultCountingOutRhymer GetFIFORhymer(); - - public defaultCountingOutRhymer GetHanoiRhymer(); - - } 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..b6411185 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,17 @@ public class IntLinkedList { - Node last; - int i; + private static final int EMPTY_LIST = -1; + 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(); } } @@ -25,16 +26,45 @@ public boolean isFull() { public int top() { if (isEmpty()) - return -1; - return last.value; + return EMPTY_LIST; + return last.getValue(); } public int pop() { if (isEmpty()) - return -1; - int ret = last.value; - last = last.prev; + return EMPTY_LIST; + int ret = last.getValue(); + last = last.getPrev(); return ret; } + private class Node { + private final int value; + private Node prev; + private Node 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; + } + } } diff --git a/src/main/java/edu/kis/vh/nursery/list/Node.java b/src/main/java/edu/kis/vh/nursery/list/Node.java deleted file mode 100644 index 0a2cd75e..00000000 --- a/src/main/java/edu/kis/vh/nursery/list/Node.java +++ /dev/null @@ -1,12 +0,0 @@ -package edu.kis.vh.nursery.list; - -public class Node { - - public int value; - public Node prev, next; - - public Node(int i) { - value = i; - } - -} diff --git a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java index 05aba9fa..a96f6ef3 100644 --- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java +++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java @@ -1,35 +1,28 @@ 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; +import edu.kis.vh.nursery.factory.RhymersFactory; class RhymersDemo { public static void main(String[] args) { - Rhymersfactory factory = new DefaultRhymersFactory(); - - defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(), - factory.GetFIFORhymer(), factory.GetHanoiRhymer()}; - + RhymersFactory factory = new DefaultRhymersFactory(); + testRhymers(factory); + } + + private static void testRhymers(RhymersFactory factory) { + DefaultCountingOutRhymer[] rhymers = {factory.getStandardRhymer(), factory.getFalseRhymer(), factory.getFirtsInFirstOutRhymer(), 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()); - + System.out.println("total rejected is " + ((HanoiRhymer) rhymers[3]).reportRejected()); } - } \ No newline at end of file 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();