Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Constants #40

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.idea/
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions src/main/java/edu/kis/vh/nursery/DefaultRhymer.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package edu.kis.vh.nursery;

public class DefaultRhymer {

public static final int DEFAULT_INDEX = -1;
public static final int NUMBERS_CAPACITY = 12;
private final int[] NUMBERS = new int[NUMBERS_CAPACITY];

public int DEFAULT_VALUE = -1;

public void countIn(int in) {
if (!isFull())
NUMBERS[++DEFAULT_VALUE] = in;
}

public boolean callCheck() {
return DEFAULT_VALUE == DEFAULT_INDEX;
}

public boolean isFull() {
return DEFAULT_VALUE == NUMBERS_CAPACITY - 1;
}

protected int peekaboo() {
if (callCheck())
return DEFAULT_INDEX;
return NUMBERS[DEFAULT_VALUE];
}

public int countOut() {
if (callCheck())
return DEFAULT_INDEX;
return NUMBERS[DEFAULT_VALUE--];
}

}
4 changes: 2 additions & 2 deletions src/main/java/edu/kis/vh/nursery/FIFORhymer.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package edu.kis.vh.nursery;

public class FIFORhymer extends defaultCountingOutRhymer {
public class FIFORhymer extends DefaultRhymer {

public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
public final DefaultRhymer temp = new DefaultRhymer();

@Override
public int countOut() {
Expand Down
13 changes: 7 additions & 6 deletions src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
package edu.kis.vh.nursery;

public class HanoiRhymer extends defaultCountingOutRhymer {
public class HanoiRhymer extends DefaultRhymer {

int totalRejected = 0;
int totalRejected = 0;

public int reportRejected() {
public int printRejectedReports() {
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);
}
}
34 changes: 0 additions & 34 deletions src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,29 +1,28 @@
package edu.kis.vh.nursery.factory;

import edu.kis.vh.nursery.defaultCountingOutRhymer;
import edu.kis.vh.nursery.DefaultRhymer;
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 DefaultRhymer GetStandardRhymer() {
return new DefaultRhymer();
}

@Override
public defaultCountingOutRhymer GetFalseRhymer() {
return new defaultCountingOutRhymer();
public DefaultRhymer GetFalseRhymer() {
return new DefaultRhymer();
}

@Override
public defaultCountingOutRhymer GetFIFORhymer() {
public DefaultRhymer GetFIFORhymer() {
return new FIFORhymer();
}

@Override
public defaultCountingOutRhymer GetHanoiRhymer() {
public DefaultRhymer GetHanoiRhymer() {
return new HanoiRhymer();
}

Expand Down
10 changes: 5 additions & 5 deletions src/main/java/edu/kis/vh/nursery/factory/Rhymersfactory.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package edu.kis.vh.nursery.factory;

import edu.kis.vh.nursery.defaultCountingOutRhymer;
import edu.kis.vh.nursery.DefaultRhymer;

public interface Rhymersfactory {

public defaultCountingOutRhymer GetStandardRhymer();
public DefaultRhymer GetStandardRhymer();

public defaultCountingOutRhymer GetFalseRhymer();
public DefaultRhymer GetFalseRhymer();

public defaultCountingOutRhymer GetFIFORhymer();
public DefaultRhymer GetFIFORhymer();

public defaultCountingOutRhymer GetHanoiRhymer();
public DefaultRhymer GetHanoiRhymer();

}
5 changes: 3 additions & 2 deletions src/main/java/edu/kis/vh/nursery/list/IntLinkedList.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

public class IntLinkedList {

public static final int FAILURE_VALUE = -1;
Node last;
int i;

Expand All @@ -25,13 +26,13 @@ public boolean isFull() {

public int top() {
if (isEmpty())
return -1;
return FAILURE_VALUE;
return last.value;
}

public int pop() {
if (isEmpty())
return -1;
return FAILURE_VALUE;
int ret = last.value;
last = last.prev;
return ret;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/edu/kis/vh/nursery/list/Node.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

public class Node {

public int value;
public final int value;
public Node prev, next;

public Node(int i) {
Expand Down
Loading