diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java index a0c6b1a..f8c26ad 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -2,40 +2,85 @@ public class NumberUtilities { + + public static String getExponentiations(int start, int stop, int step, int exponent) { + String result = ""; + for (int i = start; i < stop; i += step) { + int outcome = (int)Math.pow(i, exponent); + result = result + outcome; - public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + } + return result; } + public static String getRange(int start, int stop, int step) { - return null; + String result = ""; + for (int i = start; i < stop; i += step) { + result = result + i; + System.out.println(result); + } + return result; } public static String getRange(int start, int stop) { - return null; + String result = ""; + for (int i = start; i < stop; i++) { + result = result + i; + + } + return result; // getRange(start, stop, step;1)); } public static String getRange(int stop) { - return null; + String result = ""; + for (int i = 0; i < stop; i++) { + result = result + i; + } + return result; // getRange(start:0, stop, step:1); } /* * natural break */ - public static boolean isNumberEven(int toTest) { return false; } - public static boolean isNumberOdd(int toTest) { return false; } + public static boolean isNumberEven(int toTest) { return toTest % 2 == 0; } + public static boolean isNumberOdd(int toTest) { return toTest % 2 != 0; } public static String getEvenNumbers(int start, int stop) { - return null; + + + String result = ""; + + for (int i = start; i < stop; i++) { + if (i % 2 == 0) { + result += i; + } + + } + return result; } public static String getOddNumbers(int start, int stop) { - return null; + String result = ""; + + for (int i = start; i < stop; i++) { + if (i % 2 != 0) { + result += i; + } + + } + return result; } public static String getSquareNumbers(int start, int stop, int step) { - return null; + String result = ""; + for (int i = start; i < stop; i += step) { + result = result + (i * i); + + + } + return result; } } diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java index 7276d17..91c5909 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -2,14 +2,21 @@ public class TableUtilities { public static String getMultiplicationTable(int tableSize) { - return null; + String result = ""; + for (int i = 1; i <= tableSize; i++) { // Loop for the row, i = row + for (int j = 1; j <= tableSize; j++) { // Loop for column, j = column + result += String.format("%3d |", i * j); // %d means print number. 3 notes the amount of space + } + result += "\n"; //new line after each row + } + return result; } public static String getSmallMultiplicationTable() { - return null; + return getMultiplicationTable(5); } public static String getLargeMultiplicationTable() { - return null; + return getMultiplicationTable(10); } } diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java index 6e2f6a1..0629ae7 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,20 +3,31 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String result = ""; + int i = 1; + while (i <= numberOfStars) { + result = result + "*"; + i++; + } + return result; } public static String getTriangle(int numberOfRows) { - return null; + String result = ""; + int i = 1; + while (i < numberOfRows) { + result = result + getRow(i) + "\n"; + i++; + } + return result; } - // hmm public static String getSmallTriangle() { - return null; + return getTriangle(5); } public static String getLargeTriangle() { - return null; + return getTriangle(10); } } diff --git a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java index ad72c76..8333269 100644 --- a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -184,7 +184,7 @@ public void testGetRange3C() { @Test public void testGetEvenNumbers() { // : Given - String expected = "5791113151719"; + String expected = "681012141618"; //681012141618 int start = 5; int stop = 20; @@ -198,7 +198,7 @@ public void testGetEvenNumbers() { @Test public void testGetOddNumbers() { // : Given - String expected = "681012141618"; + String expected = "5791113151719"; //5791113151719 int start = 5; int stop = 20; int step = 5; diff --git a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java index 1f3db6a..d4a0655 100644 --- a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java +++ b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilitiesTest.java @@ -13,14 +13,14 @@ public void getRow() { String actual = TriangleUtilities.getRow(width); Assert.assertEquals(expected, actual); } - + @Test public void getRow3() { String expected = "***"; int width = 3; String actual = TriangleUtilities.getRow(width); Assert.assertEquals(expected, actual); } - + @Test public void getRow5() { String expected = "*****"; int width = 5;