From 7d643fc295641eff0c754e23a122ed541279e95c Mon Sep 17 00:00:00 2001 From: shimamoravvej Date: Thu, 6 Mar 2025 11:24:55 -0800 Subject: [PATCH 1/4] Update Exercises.java --- AP1403 - WarmUp/src/main/java/Exercises.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/AP1403 - WarmUp/src/main/java/Exercises.java b/AP1403 - WarmUp/src/main/java/Exercises.java index 923d44a..8915ac7 100644 --- a/AP1403 - WarmUp/src/main/java/Exercises.java +++ b/AP1403 - WarmUp/src/main/java/Exercises.java @@ -1,10 +1,14 @@ public class Exercises { - - /* - complete this function to check if the input number is prime or not - */ + public boolean isPrime(long n) { - // todo + if (n < 2 || n % 2 == 0){ + return false;} + elseif (n == 2) { + return true;} + for (long i = 3; i * i <= n; i+= 2) { + if (n % i == 0) + return false;} + return false; } From bb496aae01d5c4ea13d70d49d297a1f054af3027 Mon Sep 17 00:00:00 2001 From: Shima Moravvej Date: Fri, 7 Mar 2025 22:05:47 -0800 Subject: [PATCH 2/4] i have complete the codes --- AP1403 - WarmUp/.idea/.name | 1 + AP1403 - WarmUp/.idea/misc.xml | 2 +- AP1403 - WarmUp/src/main/java/Exercises.java | 54 ++++++++++++++++++-- 3 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 AP1403 - WarmUp/.idea/.name diff --git a/AP1403 - WarmUp/.idea/.name b/AP1403 - WarmUp/.idea/.name new file mode 100644 index 0000000..961c0bf --- /dev/null +++ b/AP1403 - WarmUp/.idea/.name @@ -0,0 +1 @@ +Exercises.java \ No newline at end of file diff --git a/AP1403 - WarmUp/.idea/misc.xml b/AP1403 - WarmUp/.idea/misc.xml index fdc35ea..001e756 100644 --- a/AP1403 - WarmUp/.idea/misc.xml +++ b/AP1403 - WarmUp/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/AP1403 - WarmUp/src/main/java/Exercises.java b/AP1403 - WarmUp/src/main/java/Exercises.java index 923d44a..76ab042 100644 --- a/AP1403 - WarmUp/src/main/java/Exercises.java +++ b/AP1403 - WarmUp/src/main/java/Exercises.java @@ -4,7 +4,17 @@ public class Exercises { complete this function to check if the input number is prime or not */ public boolean isPrime(long n) { - // todo + if (n < 2) + return false; + if (n == 2) + return true; + if (n % 2 == 0) + return false; + for (long i = 3; i * i <= n; i += 2){ + if (n % i == 0){ + return false; + } + } return false; } @@ -15,8 +25,26 @@ public boolean isPrime(long n) { if the input is not a fibonacci number with description above, return -1 */ public long fibonacciIndex(long n) { - // todo - return -1; + if (n == 0) + return 0; + if (n == 1) + return 1; + long x = 0; + long y = 1; + long index = 1; + + while (y < n){ + long next = x + y; + x = y; + y = next; + index ++; + } + + if (y == n) + return index; + else { + return -1; + } } /* @@ -38,7 +66,25 @@ public long fibonacciIndex(long n) { the output has to be a two-dimensional array of characters, so don't just print the triangle! */ public char[][] generateTriangle(int n) { - // todo + public char[][] generateTriangle(int n) { + + char[][] triangle = new char[n][n]; + + + for (int i = 0; i < n; i++) { + for (int j = 0; j <= i; j++) { + if (j == 0 || j == i || i == n - 1) { + triangle[i][j] = '*'; + } + else { + triangle[i][j] = ' '; + } + } + } + + // Return the 2D array representing the triangle + return triangle; + } return null; } From 89391233d72928af8a8076f45f841cd41b1d2e2a Mon Sep 17 00:00:00 2001 From: Shima Moravvej Date: Thu, 20 Mar 2025 04:22:39 -0700 Subject: [PATCH 3/4] I debugged the code --- AP1403 - WarmUp/src/main/java/Exercises.java | 83 ++++++++++++-------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/AP1403 - WarmUp/src/main/java/Exercises.java b/AP1403 - WarmUp/src/main/java/Exercises.java index b046247..e365bb1 100644 --- a/AP1403 - WarmUp/src/main/java/Exercises.java +++ b/AP1403 - WarmUp/src/main/java/Exercises.java @@ -1,18 +1,28 @@ public class Exercises { public boolean isPrime(long n) { - if (n < 2) + if(n <= 1) + { return false; - if (n == 2) + } + if(n == 2 || n == 3) + { return true; - if (n % 2 == 0) + } + if(n % 2 == 0 ) + { return false; - for (long i = 3; i * i <= n; i += 2){ - if (n % i == 0){ - return false; + } + else + { + for (long i = 3; i * i <= n ; i += 2) { + if (n % i == 0) { + return false; + } + } } - return false; + return true; } /* @@ -22,23 +32,33 @@ public boolean isPrime(long n) { if the input is not a fibonacci number with description above, return -1 */ public long fibonacciIndex(long n) { - if (n == 0) + if(n < 0 ) + { + return -1; + } + if(n == 0) + { return 0; - if (n == 1) + } + if(n == 1) + { return 1; - long x = 0; - long y = 1; - long index = 1; - - while (y < n){ - long next = x + y; - x = y; - y = next; - index ++; } - if (y == n) + long fib1 = 0; + long fib2 = 1; + long index = 1; + while(fib2 < n) + { + long temp = fib2; + fib2 = fib1+fib2; + fib1 = temp; + index++; + } + if(fib2 == n) + { return index; + } else { return -1; } @@ -63,26 +83,21 @@ public long fibonacciIndex(long n) { the output has to be a two-dimensional array of characters, so don't just print the triangle! */ public char[][] generateTriangle(int n) { - public char[][] generateTriangle(int n) { - - char[][] triangle = new char[n][n]; + if (n <= 0) return new char[0][0]; + char[][] triangle = new char[n][]; + for (int i = 0; i < n; i++) { + triangle[i] = new char[i + 1]; - for (int i = 0; i < n; i++) { - for (int j = 0; j <= i; j++) { - if (j == 0 || j == i || i == n - 1) { - triangle[i][j] = '*'; - } - else { - triangle[i][j] = ' '; - } + for (int j = 0; j <= i; j++) { + if (j == 0 || j == i || i == n - 1) { + triangle[i][j] = '*'; + } else { + triangle[i][j] = ' '; } } - - // Return the 2D array representing the triangle - return triangle; } - return null; + return triangle; } public static void main(String[] args) { From 161f28bf5cfd4e5fc58e2d1bd85cab2e9373948a Mon Sep 17 00:00:00 2001 From: Shima Moravvej Date: Thu, 20 Mar 2025 04:31:50 -0700 Subject: [PATCH 4/4] I debugged the code --- AP1403 - WarmUp/.idea/misc.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AP1403 - WarmUp/.idea/misc.xml b/AP1403 - WarmUp/.idea/misc.xml index 001e756..09accc2 100644 --- a/AP1403 - WarmUp/.idea/misc.xml +++ b/AP1403 - WarmUp/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file