From ef9f6ba229fde0432774c500eb1427c693b0d607 Mon Sep 17 00:00:00 2001 From: "Meilin Li (Linda)" Date: Wed, 29 Jun 2022 11:56:43 -0400 Subject: [PATCH 1/5] quiz1 finished, the struggle was real --- src/main/java/LoopFun.java | 10 ++++++++-- src/main/java/MathUtilities.java | 18 +++++++++++++----- src/main/java/StringUtilities.java | 19 ++++++++++++++----- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/src/main/java/LoopFun.java b/src/main/java/LoopFun.java index 801ab56..48ad800 100644 --- a/src/main/java/LoopFun.java +++ b/src/main/java/LoopFun.java @@ -10,7 +10,11 @@ public class LoopFun * @return the factorial of the number */ public Integer factorial(Integer number){ - return null; + int factorial = 1; + for (int i = 1; i <= number; i++) { + factorial = factorial * i; + } + return factorial; } /** @@ -21,7 +25,9 @@ public Integer factorial(Integer number){ * @return Upper case string of the first letter of each word */ public String acronym(String phrase) { - return null; + String s = phrase; + String result = s.replaceAll("\\B.|\\P{L}", "").toUpperCase(); + return result; } /** diff --git a/src/main/java/MathUtilities.java b/src/main/java/MathUtilities.java index e067c75..61c5985 100644 --- a/src/main/java/MathUtilities.java +++ b/src/main/java/MathUtilities.java @@ -9,7 +9,8 @@ public class MathUtilities{ * @return the sum of the two numbers */ public Integer add(Integer baseValue, Integer valueToAdd){ - return null; + int sum = baseValue + valueToAdd; + return sum; } /** @@ -19,7 +20,8 @@ public Integer add(Integer baseValue, Integer valueToAdd){ * @return the sum of the two numbers */ public Double add(Double baseValue, Double valueToAdd){ - return null; + double sum = baseValue + valueToAdd; + return sum; } /** @@ -28,7 +30,8 @@ public Double add(Double baseValue, Double valueToAdd){ * @return the half of the number in double */ public Double half(Integer number) { - return null; + double half = number * 0.5; + return half; } /** @@ -37,7 +40,11 @@ public Double half(Integer number) { * @return true if the number is odd, false if it is even */ public Boolean isOdd(Integer number){ - return null; + if (number % 2 != 0) { + return true; + } else { + return false; + } } @@ -47,7 +54,8 @@ public Boolean isOdd(Integer number){ * @return the result of the number multiply by itself */ public Integer square(Integer number) { - return null; + int square = number * number; + return square; } } diff --git a/src/main/java/StringUtilities.java b/src/main/java/StringUtilities.java index e3ea8a9..069e61b 100644 --- a/src/main/java/StringUtilities.java +++ b/src/main/java/StringUtilities.java @@ -5,7 +5,7 @@ public class StringUtilities { * @return `input` */ public String returnInput(String input) { - return null; + return input; } /** @@ -14,7 +14,8 @@ public String returnInput(String input) { * @return the concatenation of `baseValue` and `valueToBeAdded` */ public String concatenate(String baseValue, String valueToBeAdded) { - return null; + String concatenate = baseValue + valueToBeAdded; + return concatenate; } /** @@ -22,7 +23,11 @@ public String concatenate(String baseValue, String valueToBeAdded) { * @return identical string with characters in opposite order */ public String reverse(String valueToBeReversed) { - return null; + // Declaring a StringBuilder and converting string to StringBuilder + StringBuilder reverseString = new StringBuilder(valueToBeReversed); + reverseString.reverse(); // Reversing the StringBuilder + String result = reverseString.toString(); // Converting StringBuilder to String + return result; // Returns the reversed String } /** @@ -30,7 +35,9 @@ public String reverse(String valueToBeReversed) { * @return middle character of `word` */ public Character getMiddleCharacter(String word) { - return null; + int length = word.length(); + int middleOfWord = length / 2; + return word.charAt(middleOfWord); } /** @@ -38,6 +45,7 @@ public Character getMiddleCharacter(String word) { * @param charToRemove character to be removed from `value` * @return `value` with char of value `charToRemove` removed */ + // Not working, come back later public String removeCharacter(String value, Character charToRemove) { return null; } @@ -47,6 +55,7 @@ public String removeCharacter(String value, Character charToRemove) { * @return last `word` in sentence */ public String getLastWord(String sentence) { - return null; + String lastWord = sentence.substring(sentence.lastIndexOf(" ")+1); + return lastWord; } } From eeccd3168f4369953f0ad13836a55688a82bb45e Mon Sep 17 00:00:00 2001 From: "Meilin Li (Linda)" Date: Wed, 29 Jun 2022 12:05:33 -0400 Subject: [PATCH 2/5] huh --- src/main/java/LoopFun.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/LoopFun.java b/src/main/java/LoopFun.java index 48ad800..d736b37 100644 --- a/src/main/java/LoopFun.java +++ b/src/main/java/LoopFun.java @@ -1,4 +1,4 @@ - +// Quiz 1 - Linda Li public class LoopFun { From 864a8dab22170ea37446fbfc36e3699cc4a9ea29 Mon Sep 17 00:00:00 2001 From: "Meilin Li (Linda)" Date: Wed, 29 Jun 2022 14:04:37 -0400 Subject: [PATCH 3/5] finished removechar problem, only stuck on the encrypt problem now --- src/main/java/LoopFun.java | 1 - src/main/java/StringUtilities.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/LoopFun.java b/src/main/java/LoopFun.java index d736b37..60be45b 100644 --- a/src/main/java/LoopFun.java +++ b/src/main/java/LoopFun.java @@ -1,4 +1,3 @@ -// Quiz 1 - Linda Li public class LoopFun { diff --git a/src/main/java/StringUtilities.java b/src/main/java/StringUtilities.java index 069e61b..0c683a1 100644 --- a/src/main/java/StringUtilities.java +++ b/src/main/java/StringUtilities.java @@ -45,9 +45,9 @@ public Character getMiddleCharacter(String word) { * @param charToRemove character to be removed from `value` * @return `value` with char of value `charToRemove` removed */ - // Not working, come back later public String removeCharacter(String value, Character charToRemove) { - return null; + String strNew = value.replace(String.valueOf(charToRemove), ""); + return strNew; } /** From 4986a50f4aed449f4700ca40967910eb2bb2476c Mon Sep 17 00:00:00 2001 From: "Meilin Li (Linda)" Date: Wed, 29 Jun 2022 18:20:10 -0400 Subject: [PATCH 4/5] finished encrypt. quiz1 has been complete. --- src/main/java/LoopFun.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/main/java/LoopFun.java b/src/main/java/LoopFun.java index 60be45b..43bfc41 100644 --- a/src/main/java/LoopFun.java +++ b/src/main/java/LoopFun.java @@ -11,7 +11,7 @@ public class LoopFun public Integer factorial(Integer number){ int factorial = 1; for (int i = 1; i <= number; i++) { - factorial = factorial * i; + factorial *= i; } return factorial; } @@ -42,6 +42,15 @@ public String acronym(String phrase) { * @return the encrypted string by shifting each character by three character */ public String encrypt(String word) { - return null; + String encrypt = ""; + for (int i = 0; i < word.length(); i++) { + char c = (char)(word.charAt(i) + 3); + if (c > 'z') + encrypt += (char)(word.charAt(i)-(23)); + else { + encrypt += (char)(word.charAt(i) + 3); + } + } + return encrypt; } } From d600986abff45881a03240032262c31c286ba50d Mon Sep 17 00:00:00 2001 From: "Meilin Li (Linda)" Date: Wed, 29 Jun 2022 19:06:17 -0400 Subject: [PATCH 5/5] changed code for encrypt --- src/main/java/LoopFun.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/LoopFun.java b/src/main/java/LoopFun.java index 43bfc41..c054f28 100644 --- a/src/main/java/LoopFun.java +++ b/src/main/java/LoopFun.java @@ -44,13 +44,12 @@ public String acronym(String phrase) { public String encrypt(String word) { String encrypt = ""; for (int i = 0; i < word.length(); i++) { - char c = (char)(word.charAt(i) + 3); - if (c > 'z') - encrypt += (char)(word.charAt(i)-(23)); - else { - encrypt += (char)(word.charAt(i) + 3); - } + char letter = word.charAt(i); + letter += 3; + if (letter > 'z') letter -= 26; + encrypt += letter; } return encrypt; } -} + +} \ No newline at end of file