From 8877e8f85ecc2a1b36b44fe4f3846503ef5e2e53 Mon Sep 17 00:00:00 2001 From: Sean Mis Date: Thu, 8 Feb 2018 19:47:20 -0500 Subject: [PATCH] NTT Totally Done --- .../mastering_loops/NumberUtilities.java | 34 ++++++++++++++++--- .../mastering_loops/TableUtilities.java | 30 ++++++++++++++-- .../mastering_loops/TriangleUtilities.java | 34 ++++++++++++++++--- .../mastering_loops/NumberUtilitiesTest.java | 4 +-- 4 files changed, 88 insertions(+), 14 deletions(-) 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..397a21d 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -3,26 +3,50 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + String evens = ""; + for(int i = start; i < stop; i++) { + if(i % 2 == 0) { + evens += Integer.toString(i); + } + } + return evens; } public static String getOddNumbers(int start, int stop) { - return null; + String odds = ""; + for(int i = start; i < stop; i++) { + if(i % 2 != 0) { + odds += Integer.toString(i); + } + } + return odds; } public static String getSquareNumbers(int start, int stop, int step) { - return null; + String squares = ""; + for(int i = start; i < stop; i+=step) { + squares += Integer.toString(i*i); + } + return squares; } public static String getRange(int start, int stop, int step) { - return null; + String range = ""; + for(int i = start; i < stop; i+=step) { + range += Integer.toString(i); + } + return range; } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + String expo = ""; + for(int i = start; i < stop; i+=step) { + expo += (int) Math.pow(i, exponent); + } + return expo; } } 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..4f635d6 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -2,14 +2,38 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + StringBuilder smallMult = new StringBuilder(); + for (int row = 1; row <= 5; row++) { + for (int col = 1; col <= 5; col++) { + int colRow = col * row; + smallMult.append(String.format("%3d |", colRow)); + } + smallMult.append("\n"); + } + return smallMult.toString(); } public static String getLargeMultiplicationTable() { - return null; + StringBuilder largeMult = new StringBuilder(); + for (int row = 1; row <= 10; row++) { + for (int col = 1; col <= 10; col++) { + int colRow = col * row; + largeMult.append(String.format("%3d |", colRow)); + } + largeMult.append("\n"); + } + return largeMult.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder multTab = new StringBuilder(); + for (int row = 1; row <= tableSize; row++) { + for (int col = 1; col <= tableSize; col++) { + int colRow = col * row; + multTab.append(String.format("%3d |", colRow)); + } + multTab.append("\n"); + } + return multTab.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..7276b23 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,44 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - return null; + StringBuilder newTri = new StringBuilder(); + + for(int row=1; row < numberOfRows; row++) { + for(int col=0; col < row; col++) { + newTri.append("*"); + } + newTri.append("\n"); + } + return newTri.toString(); } public static String getRow(int numberOfStars) { - return null; + StringBuilder newRow = new StringBuilder(); + for(int i=0; i < numberOfStars; i++) { + newRow.append("*"); + } + return newRow.toString(); } public static String getSmallTriangle() { - return null; + StringBuilder smallTri = new StringBuilder(); + for(int row=1; row < 5; row++) { + for(int col=0; col < row; col++) { + smallTri.append("*"); + } + smallTri.append("\n"); + } + return smallTri.toString(); } public static String getLargeTriangle() { - return null; + StringBuilder getTri = new StringBuilder(); + for(int row=1; row < 10; row++) { + for(int col=0; col < row; col++) { + getTri.append("*"); + } + getTri.append("\n"); + } + return getTri.toString(); } } 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..5ce91f7 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 = "681012141618"; 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;