From 11f91527ad875e064be77106b53bb6878b4b2b99 Mon Sep 17 00:00:00 2001 From: Eric Cordell Date: Wed, 7 Feb 2018 19:33:49 -0500 Subject: [PATCH 1/4] Num Utility test --- .../mastering_loops/NumberUtilities.java | 39 ++++++++++++++++--- .../mastering_loops/NumberUtilitiesTest.java | 4 +- 2 files changed, 36 insertions(+), 7 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..1ef137b 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,55 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + StringBuilder even = new StringBuilder(); + + for (int i = start; i < stop; i++){ + if((i % 2) == 0){ + even.append(i); + } + } + return even.toString(); } public static String getOddNumbers(int start, int stop) { - return null; + StringBuilder odd = new StringBuilder(); + for (int i = start; i < stop; i++) { + if ((i % 2) != 0) { + odd.append(i); + } + } + return odd.toString(); } public static String getSquareNumbers(int start, int stop, int step) { - return null; + StringBuilder square = new StringBuilder(); + for(int i = start; i < stop; i+= step){ + int squaredNum = (int)Math.pow(i, 2); + square.append(squaredNum); + } + return square.toString(); } public static String getRange(int start, int stop, int step) { - return null; + StringBuilder range = new StringBuilder(); + for(int i = start; i < stop; i+= step){ + range.append(i); + } + return range.toString(); } public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + StringBuilder expo = new StringBuilder(); + for(int i = start; i < stop; i += step){ + int expoVar = exponent; + int squaredNum = (int)Math.pow(i, expoVar); + expo.append(squaredNum); + } + return expo.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; From 2d693d6c88d61d38b918c9014c6e4b185266b57a Mon Sep 17 00:00:00 2001 From: Eric Cordell Date: Wed, 7 Feb 2018 21:04:02 -0500 Subject: [PATCH 2/4] Multi table --- .../mastering_loops/TableUtilities.java | 27 ++++++++++++++++--- .../mastering_loops/TriangleUtilities.java | 2 ++ 2 files changed, 26 insertions(+), 3 deletions(-) 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..046efc8 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,35 @@ public class TableUtilities { public static String getSmallMultiplicationTable() { - return null; + StringBuilder sb = new StringBuilder(); + for (int i = 1; i <= 5; i++) { + for (int j =1; j <= 5; j++){ + sb.append(String.format("%3d |", i *j)); + } + sb.append("\n"); + } + return sb.toString(); } public static String getLargeMultiplicationTable() { - return null; + StringBuilder sb = new StringBuilder(); + for (int i = 1; i <= 10; i++) { + for (int j =1; j <= 10; j++){ + sb.append(String.format("%3d |", i *j)); + } + sb.append("\n"); + } + return sb.toString(); } public static String getMultiplicationTable(int tableSize) { - return null; + StringBuilder sb = new StringBuilder(); + for (int i = 1; i <= tableSize; i++) { + for (int j =1; j <= tableSize; j++){ + sb.append(String.format("%3d |", i *j)); + } + sb.append("\n"); + } + return sb.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..b42a001 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,10 +3,12 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { + return null; } public static String getRow(int numberOfStars) { + return null; } From 9a1d27a48dea40e83e529e356b160085cec6197c Mon Sep 17 00:00:00 2001 From: Eric Cordell Date: Wed, 7 Feb 2018 21:53:56 -0500 Subject: [PATCH 3/4] Triangle Test --- .../mastering_loops/TriangleUtilities.java | 37 ++++++++++++++++--- 1 file changed, 31 insertions(+), 6 deletions(-) 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 b42a001..187d13c 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,20 +3,45 @@ public class TriangleUtilities { public static String getTriangle(int numberOfRows) { - - return null; + String output = ""; + for (int i = 1; i < numberOfRows; i++) { + for (int j = 0; j < i; j++) { + output += "*"; + } + output += '\n'; + } + return output.trim() + "\n"; } - public static String getRow(int numberOfStars) { - return null; + public static String getRow(int numberOfStars) { + String output = ""; + for (int i = 0; i < numberOfStars; i++) { + output += "*"; + } + return output; } public static String getSmallTriangle() { - return null; + String output = ""; + for (int i = 0; i <= 4; i++) { + for (int j = 0; j < i; j++) { + output += "*"; + } + output += '\n'; + } + return output.trim() + "\n"; } + public static String getLargeTriangle() { - return null; + String output = ""; + for (int i = 0; i <= 9; i++) { + for (int j = 0; j < i; j++) { + output += "*"; + } + output += '\n'; + } + return output.trim() + "\n"; } } From 7ce3e0dc537dee329d5288f375870d05666a9931 Mon Sep 17 00:00:00 2001 From: Eric Cordell Date: Wed, 7 Feb 2018 22:11:57 -0500 Subject: [PATCH 4/4] Updated num, tri, tab --- .../microlabs/mastering_loops/TriangleUtilities.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 187d13c..8444259 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -10,7 +10,7 @@ public static String getTriangle(int numberOfRows) { } output += '\n'; } - return output.trim() + "\n"; + return output; } @@ -23,25 +23,26 @@ public static String getRow(int numberOfStars) { } public static String getSmallTriangle() { + String output = ""; - for (int i = 0; i <= 4; i++) { + for (int i = 1; i <= 4; i++) { for (int j = 0; j < i; j++) { output += "*"; } output += '\n'; } - return output.trim() + "\n"; + return output; } public static String getLargeTriangle() { String output = ""; - for (int i = 0; i <= 9; i++) { + for (int i = 1; i <= 9; i++) { for (int j = 0; j < i; j++) { output += "*"; } output += '\n'; } - return output.trim() + "\n"; + return output; } }