diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java index 5a742c4..10f28fe 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -1,28 +1,69 @@ package io.zipcoder.microlabs.mastering_loops; +import java.util.Scanner; + public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + String evenNumbers = ""; + + for(int i= start; i <= stop; i++) { + if(i % 2 == 0) { + evenNumbers += Integer.toString(i); + } + } + return evenNumbers; } public static String getOddNumbers(int start, int stop) { - return null; + String oddNumbers = ""; + + for(int i= start; i <= stop; i++) { + if(i % 2 != 0) { + oddNumbers += Integer.toString(i); + } + } + return oddNumbers; } + public static String getSquareNumbers(int start, int stop, int step) { - return null; + String squareNums = ""; + + for (int i = start; i < stop; i += step) { + int answer = (int)(Math.pow(i, 2)); + squareNums += Integer.toString(answer); + } + + return squareNums; } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder newRange = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + newRange.append(i); + } + String completeRange = newRange.toString(); + + return completeRange; } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + + StringBuilder newValues = new StringBuilder(); + + for (int i = start; i < stop; i += step) { + int answer = (int) (Math.pow(i, exponent)); + newValues.append(answer); + } + String completeValues = newValues.toString(); + + return completeValues; } } diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java index e27a826..506524d 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -1,15 +1,54 @@ package io.zipcoder.microlabs.mastering_loops; public class TableUtilities { + public static String getSmallMultiplicationTable() { - return null; + + StringBuilder smallMult = new StringBuilder(); + + + for (int i = 1; i <= 5; i++) { + for (int j = 1; j <= 5; j++) { + + smallMult.append(String.format("%3d |", i*j)); + } + smallMult.append("\n"); + } + String completedTable = smallMult.toString(); + return completedTable; } + public static String getLargeMultiplicationTable() { - return null; + + StringBuilder largeMult = new StringBuilder(); + + + for (int i = 1; i <= 10; i++) { + for (int j = 1; j <= 10; j++) { + + largeMult.append(String.format("%3d |", i*j)); + } + largeMult.append("\n"); + } + String completedTable = largeMult.toString(); + return completedTable; } public static String getMultiplicationTable(int tableSize) { - return null; + + StringBuilder multTable = new StringBuilder(); + + for(int i = 1; i <= tableSize; i++) { + for(int j = 1; j <= tableSize; j++) { + multTable.append(String.format("%3d |", i*j)); + } + multTable.append("\n"); + } + + String completedTable = multTable.toString(); + return completedTable; + } + } diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java index 0c7cd35..ba49e4f 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,18 +3,62 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + StringBuilder triangle = new StringBuilder(); + + + for (int i = 1; i < numberOfRows; i++) { + for (int j = 0; j < i; j++) { + triangle.append("*"); + } + triangle.append("\n"); + + } + String completedTriangle = triangle.toString(); + + return completedTriangle; } public static String getRow(int numberOfStars) { - return null; + + StringBuilder stars = new StringBuilder(); + + for (int i = 0; i < numberOfStars; i++) { + stars.append("*"); + } + return stars.toString(); } + public static String getSmallTriangle() { - return null; + + StringBuilder smallTriangle = new StringBuilder(); + + + for (int i = 1; i < 5; i++) { + for (int j = 0; j < i; j++) { + smallTriangle.append("*"); + } + smallTriangle.append("\n"); + + } + String completedTriangle = smallTriangle.toString(); + return completedTriangle; } public static String getLargeTriangle() { - return null; + + StringBuilder largeTriangle = new StringBuilder(); + + + for (int i = 1; i < 10; i++) { + for (int j = 0; j < i; j++) { + largeTriangle.append("*"); + } + largeTriangle.append("\n"); + + } + String completedTriangle = largeTriangle.toString(); + return completedTriangle; } } diff --git a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java index e579b43..fc4540f 100644 --- a/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -51,7 +51,7 @@ public void testGetRange2() { @Test public void testGetEvenNumbers() { // : Given - String expected = "5791113151719"; + String expected = "68101214161820"; int start = 5; int stop = 20; @@ -65,7 +65,7 @@ public void testGetEvenNumbers() { @Test public void testGetOddNumbers() { // : Given - String expected = "681012141618"; + String expected = "5791113151719"; int start = 5; int stop = 20; int step = 5;