Constants

.gitignore

@@ -0,0 +1,3 @@
+.idea/
+bin/
+target/

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() {

src/main/java/edu/kis/vh/nursery/HanoiRhymer.java

@@ -2,14 +2,15 @@
 
 public class HanoiRhymer extends defaultCountingOutRhymer {
 
-int totalRejected = 0;
+    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);

src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java

@@ -2,32 +2,36 @@
 
 public class defaultCountingOutRhymer {
 
-    private int[] NUMBERS = new int[12];
+    public static final int EMPTY = -1;
+    public static final int CAPACITY = 12;
+    public static final int FULL = CAPACITY-1;
+    private final int[] NUMBERS = new int[CAPACITY];
+
+    public int total = EMPTY;
 
-    public int total = -1;
 
     public void countIn(int in) {
         if (!isFull())
             NUMBERS[++total] = in;
     }
 
         public boolean callCheck() {
-            return total == -1;
+            return total == EMPTY;
         }
 
             public boolean isFull() {
-                return total == 11;
+                return total == FULL;
             }
 
                 protected int peekaboo() {
                     if (callCheck())
-                        return -1;
+                        return EMPTY;;
                     return NUMBERS[total];
                 }
 
                     public int countOut() {
                         if (callCheck())
-                            return -1;
+                            return EMPTY;
                         return NUMBERS[total--];
                     }
 

src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java

@@ -2,6 +2,8 @@
 
 public class IntLinkedList {
 
+    public static final int EMPTY = -1;
+
     Node last;
     int i;
 
@@ -25,13 +27,13 @@ public boolean isFull() {
 
     public int top() {
         if (isEmpty())
-            return -1;
+            return EMPTY;
         return last.value;
     }
 
     public int pop() {
         if (isEmpty())
-            return -1;
+            return EMPTY;
         int ret = last.value;
         last = last.prev;
         return ret;

src/main/java/edu/kis/vh/nursery/list/Node.java

@@ -2,7 +2,7 @@
 
 public class Node {
 
-    public int value;
+    public final int value;
     public Node prev, next;
 
     public Node(int i) {