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..6b4760b 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,62 @@ package io.zipcoder.microlabs.mastering_loops; - +import java.lang.*; public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + + StringBuilder evenNum = new StringBuilder(); + for (int i = start; i < stop; i++) { + if (i % 2 == 0) { + evenNum.append(i); + } + } + return evenNum.toString(); } public static String getOddNumbers(int start, int stop) { - return null; + + StringBuilder oddNum = new StringBuilder(); + for (int i = start; i <= stop; i++) { + if (i % 2 != 0) { + oddNum.append(i); + } + } + return oddNum.toString(); } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + StringBuilder sqNum = new StringBuilder(); + + for (int i = start; i < stop; i+=step) { + sqNum.append(Math.round(Math.pow(i, 2))); + } + return sqNum.toString(); } public static String getRange(int start, int stop, int step) { - return null; + + StringBuilder rangeNum = new StringBuilder(); + + for (int i = start; i < stop; i+=step) { + rangeNum.append(i); + } + return rangeNum.toString(); + } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + + StringBuilder exponentNum = new StringBuilder(); + + for (int i = start; i < stop; i+=step) { + exponentNum.append(Math.round(Math.pow(i, exponent))); + } + return exponentNum.toString(); } } 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..34c2a09 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,28 @@ package io.zipcoder.microlabs.mastering_loops; public class TableUtilities { + public static String getSmallMultiplicationTable() { - return null; + + return getMultiplicationTable(5); } public static String getLargeMultiplicationTable() { - return null; + + return getMultiplicationTable(10); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder matrix = new StringBuilder(); + + for(int row = 1; row <= tableSize; row++) { + for(int col = 1; col <= tableSize; col++){ + matrix.append(String.format("%3d |", row * col)); + } + matrix.append("\n"); + } + return matrix.toString(); } } + + 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..97dbc3b 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,38 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + + String triangleContainer = ""; + + for (int row=1; row < numberOfRows; row++) + { + for (int column=0; column