From 186fbab6ba681936830082aad3af25953b83cc37 Mon Sep 17 00:00:00 2001 From: danishahsancs Date: Wed, 16 Jul 2025 11:09:20 -0400 Subject: [PATCH] finished numbers and triangles --- .../mastering_loops/NumberUtilities.java | 57 ++++++++++++++++--- .../mastering_loops/TableUtilities.java | 22 ++++++- .../mastering_loops/TriangleUtilities.java | 20 +++++-- .../mastering_loops/NumberUtilitiesTest.java | 5 +- 4 files changed, 86 insertions(+), 18 deletions(-) diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java index a0c6b1a..521016a 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/NumberUtilities.java @@ -4,38 +4,77 @@ public class NumberUtilities { public static String getExponentiations(int start, int stop, int step, int exponent) { - return null; + String result = ""; + + for(int i = start; i < stop; i+=step){ + result+=(int)(Math.pow(i, exponent)); + } + return result; } public static String getRange(int start, int stop, int step) { - return null; + String result = ""; + + for(int i = start ; i < stop; i+=step){ + result+= i; + } + return result; } public static String getRange(int start, int stop) { - return null; + String result = ""; + + for(int i = start ; i < stop; i++){ + result+= i; + } + return result; } public static String getRange(int stop) { - return null; + String result = ""; + + for(int i = 0 ; i < stop; i++){ + result+= i; + } + return result; } /* * natural break */ - public static boolean isNumberEven(int toTest) { return false; } - public static boolean isNumberOdd(int toTest) { return false; } + public static boolean isNumberEven(int toTest) { return toTest%2==0; } + public static boolean isNumberOdd(int toTest) { return toTest%2!=0; } public static String getEvenNumbers(int start, int stop) { - return null; + String result = ""; + + for(int i = start ; i < stop; i++){ + if(isNumberEven(i)) + result+=i; + } + return result; + } public static String getOddNumbers(int start, int stop) { - return null; + String result = ""; + + for(int i = start ; i < stop; i++){ + if(isNumberOdd(i)) + result+=i; + } + return result; + } public static String getSquareNumbers(int start, int stop, int step) { - return null; + String result = ""; + + for(int i = start ; i < stop; i+=step){ + result+=i*i; + } + return result; } } diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java index 7276d17..cd4e2d3 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TableUtilities.java @@ -2,14 +2,30 @@ public class TableUtilities { public static String getMultiplicationTable(int tableSize) { - return null; + + String result = ""; + + for (int i = 1; i < tableSize + 1; i++) { + for (int y = 1; y < tableSize + 1; y++) { + int temp = i*y; + if(temp<10) + result+=" "+temp+" |"; + else if (temp<100) + result+=" "+temp+" |"; + else + result+=""+temp+" |"; + } + result+="\n"; + } + + return result; } public static String getSmallMultiplicationTable() { - return null; + return getMultiplicationTable(5); } public static String getLargeMultiplicationTable() { - return null; + return getMultiplicationTable(10); } } diff --git a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java index 6e2f6a1..287b1e6 100644 --- a/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java +++ b/java/src/main/java/io/zipcoder/microlabs/mastering_loops/TriangleUtilities.java @@ -3,20 +3,32 @@ public class TriangleUtilities { public static String getRow(int numberOfStars) { - return null; + String result = ""; + for(int i = 1; i <= numberOfStars; i++){ + result +='*'; + } + + + return result; } public static String getTriangle(int numberOfRows) { - return null; + + String temp = ""; + + for (int i = 1; i < numberOfRows;i++){ + temp+= getRow(i)+'\n'; + } + return temp; } // hmm public static String getSmallTriangle() { - return null; + return getTriangle(5); } public static String getLargeTriangle() { - return null; + return getTriangle(10); } } diff --git a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java index ad72c76..bf8b1e4 100644 --- a/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java +++ b/java/src/test/java/io/zipcoder/microlabs/mastering_loops/NumberUtilitiesTest.java @@ -184,7 +184,8 @@ public void testGetRange3C() { @Test public void testGetEvenNumbers() { // : Given - String expected = "5791113151719"; + + String expected = "681012141618"; int start = 5; int stop = 20; @@ -198,7 +199,7 @@ public void testGetEvenNumbers() { @Test public void testGetOddNumbers() { // : Given - String expected = "681012141618"; + String expected = "5791113151719"; int start = 5; int stop = 20; int step = 5;