diff --git a/.classpath b/.classpath
new file mode 100644
index 00000000..f7e4a1dd
--- /dev/null
+++ b/.classpath
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..e9628087
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,18 @@
+# Ignorowanie plików wygenerowanych przez IDE
+.idea/
+.vscode/
+
+# Ignorowanie plików wykonywalnych
+*.exe
+*.dll
+
+# Ignorowanie plików tymczasowych
+*.tmp
+*.bak
+
+# Ignorowanie plików konfiguracyjnych, które mogą zawierać hasła
+*.config
+
+# Ignorowanie plików logów
+*.log
+/target/
diff --git a/.project b/.project
new file mode 100644
index 00000000..4ee4a323
--- /dev/null
+++ b/.project
@@ -0,0 +1,23 @@
+
+
+ pio_git_rhymers
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ org.eclipse.m2e.core.maven2Builder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+ org.eclipse.m2e.core.maven2Nature
+
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000..5b781ec6
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/test/java=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000..2f5cc74c
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/src/.classpath b/src/.classpath
new file mode 100644
index 00000000..235189e8
--- /dev/null
+++ b/src/.classpath
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
diff --git a/src/.gitignore b/src/.gitignore
new file mode 100644
index 00000000..ae3c1726
--- /dev/null
+++ b/src/.gitignore
@@ -0,0 +1 @@
+/bin/
diff --git a/src/.project b/src/.project
new file mode 100644
index 00000000..0f6f6a76
--- /dev/null
+++ b/src/.project
@@ -0,0 +1,17 @@
+
+
+ src
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
index 28591ada..142cc655 100644
--- a/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/FIFORhymer.java
@@ -1,21 +1,14 @@
package edu.kis.vh.nursery;
-public class FIFORhymer extends defaultCountingOutRhymer {
-
- public defaultCountingOutRhymer temp = new defaultCountingOutRhymer();
-
+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());
-
+ 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..54c99eed 100644
--- a/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/HanoiRhymer.java
@@ -1,17 +1,16 @@
package edu.kis.vh.nursery;
-public class HanoiRhymer extends defaultCountingOutRhymer {
-
-int totalRejected = 0;
-
+public class HanoiRhymer extends DefaultCountingOutRhymer {
+ 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);
}
-}
+}
\ 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 199abf6d..45c825c2 100644
--- a/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
+++ b/src/main/java/edu/kis/vh/nursery/defaultCountingOutRhymer.java
@@ -1,34 +1,36 @@
package edu.kis.vh.nursery;
-public class defaultCountingOutRhymer {
+public class DefaultCountingOutRhymer {
- private int[] NUMBERS = new int[12];
+ public static final int TOTAL_NUMBERS = 12;
+ public static final int EMPTY = -1;
+ public static final int MAX_CAPACITY = TOTAL_NUMBERS - 1;
+
+ private int[] NUMBERS = new int[TOTAL_NUMBERS];
- public int total = -1;
+ public int total = EMPTY;
public void countIn(int in) {
if (!isFull())
- NUMBERS[++total] = in;
+ numbers[++total] = in;
+ }
+ public boolean callCheck() {
+ return total == EMPTY;
}
-
- public boolean callCheck() {
- return total == -1;
- }
- public boolean isFull() {
- return total == 11;
- }
+ public boolean isFull() {
+ return total == MAX_CAPACITY;
+ }
- protected int peekaboo() {
- if (callCheck())
- return -1;
- return NUMBERS[total];
- }
-
- public int countOut() {
- if (callCheck())
- return -1;
- return NUMBERS[total--];
- }
+ protected int peekaboo() {
+ if (callCheck())
+ return EMPTY;
+ return numbers[total];
+ }
+ public int countOut() {
+ if (callCheck())
+ return EMPTY;
+ 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..537d50ae 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.DefaultCountingOutRhymer;
import edu.kis.vh.nursery.FIFORhymer;
import edu.kis.vh.nursery.HanoiRhymer;
-import edu.kis.vh.nursery.factory.Rhymersfactory;
+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() {
+ 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..0db3ac2a 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 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..a79691ea 100644
--- a/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
+++ b/src/test/java/edu/kis/vh/nursery/RhymersDemo.java
@@ -1,17 +1,18 @@
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;
+import edu.kis.vh.nursery.factory.RhymersFactory;
+/**
+ * Comment do clasu RhymersDemo
+ */
class RhymersDemo {
- public static void main(String[] args) {
- Rhymersfactory factory = new DefaultRhymersFactory();
-
- defaultCountingOutRhymer[] rhymers = { factory.GetStandardRhymer(), factory.GetFalseRhymer(),
- factory.GetFIFORhymer(), factory.GetHanoiRhymer()};
+ 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++)
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();