From 8dc503586c1d3e1355fd33f880582c32452909df Mon Sep 17 00:00:00 2001 From: Ahson Chaudhary Date: Fri, 9 Feb 2018 00:52:48 -0500 Subject: [PATCH 1/2] Finally Complete --- .../microlabs/mastering_loops/MainApp.java | 2 + .../mastering_loops/NumberUtilities.java | 54 ++++++++++++++-- .../mastering_loops/TableUtilities.java | 61 +++++++++++++++++-- .../mastering_loops/TriangleUtilities.java | 28 +++++++-- .../mastering_loops/NumberUtilitiesTest.java | 4 +- 5 files changed, 135 insertions(+), 14 deletions(-) diff --git a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java index 29e339b..059d032 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/MainApp.java @@ -7,5 +7,7 @@ */ public class MainApp { public static void main(String[] args) { + + } } 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..6df17b8 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -3,22 +3,68 @@ public class NumberUtilities { public static String getEvenNumbers(int start, int stop) { - return null; + + String outcome = ""; + + for (int i = start; i <= stop; i++){ + + if (i % 2 == 0) + { + + outcome += i; + + } + + } + + return outcome; } public static String getOddNumbers(int start, int stop) { - return null; + + String outcome = ""; + + for (int i = start; i <= stop; i++) + + { + if (i % 2 != 0) + { + + outcome += i; + + } + } + + + return outcome; } public static String getSquareNumbers(int start, int stop, int step) { - return null; + + String outcome = ""; + + for (int i = start; i < stop; i += step) + { + outcome += i * i; + } + + return outcome; } public static String getRange(int start, int stop, int step) { - return null; + + String outcome = ""; + + for (int i = start; i < stop; i += step) + { + outcome += i; + + } + + return outcome; } 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..027098a 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,68 @@ package io.zipcoder.microlabs.mastering_loops; -public class TableUtilities { - public static String getSmallMultiplicationTable() { - return null; + +public class TableUtilities +{ + public static String getSmallMultiplicationTable() + { + //stringBuilder are mutable/can be changed + StringBuilder smallMultiplicationTable = new StringBuilder(); + + for (int i = 1; i <= 5; i++) + { + for (int j = 1; j<= 5; j++) + { + + int num = i * j; + smallMultiplicationTable.append(String.format("%3d |", num)); + + } smallMultiplicationTable.append("\n"); + + + } + + String myTable = smallMultiplicationTable.toString(); + return myTable; + + + } public static String getLargeMultiplicationTable() { - return null; + + StringBuilder largeMultiplicationTable = new StringBuilder(); + + for (int i = 1; i <= 10; i++) + { + + for (int j = 1; j <= 10; j++) + { + int num = i * j; + largeMultiplicationTable.append(String.format("%3d |", num)); + + } largeMultiplicationTable.append("\n"); + } + + String largeTable = largeMultiplicationTable.toString(); + return largeTable; } public static String getMultiplicationTable(int tableSize) { + + StringBuilder multiplicationTable = new StringBuilder(); + + for (int i = 0; i <= tableSize; i++){ + + for (int j = 0; j <= tableSize; j++) + { + int num = i * j; + multiplicationTable.append(String.format("%3d |", num)); + + } + + } + + return null; } } 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..d8eff2e 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 triangle = ""; + + for (int i = 1; i < numberOfRows; i++){ + + triangle += TriangleUtilities.getRow(i) + "\n"; + } + + return triangle; } public static String getRow(int numberOfStars) { - return null; + + String row = ""; + + for (int i = 1; i <= numberOfStars; i++) + { + row += "*"; + + } + + return row; } + // public static String getSmallTriangle() { - return null; + + return getTriangle(5); } public static String getLargeTriangle() { - return null; + + return getTriangle(10); } } 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 35a1a77ac2be4cad8ccd07c291d50d86c0590add Mon Sep 17 00:00:00 2001 From: Ahson Chaudhary Date: Fri, 9 Feb 2018 01:04:07 -0500 Subject: [PATCH 2/2] Edited and Completed second time --- .../mastering_loops/TableUtilities.java | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 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 027098a..9e83ae2 100644 --- a/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -49,20 +49,26 @@ public static String getLargeMultiplicationTable() { public static String getMultiplicationTable(int tableSize) { - StringBuilder multiplicationTable = new StringBuilder(); - for (int i = 0; i <= tableSize; i++){ - for (int j = 0; j <= tableSize; j++) - { - int num = i * j; - multiplicationTable.append(String.format("%3d |", num)); + StringBuilder multiplicationTable = new StringBuilder(); + + for (int i = 1; i <= tableSize; i++){ + + for (int j = 1; j <= tableSize; j++){ + + int num = i * j; + multiplicationTable.append(String.format("%3d |", num)); + + } multiplicationTable.append(String.format("\n")); } - } + String myTable = multiplicationTable.toString(); + return myTable; - return null; + } + } -} +