From 82381df74ea043d7899c684ea780e5fee0c3fb27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 17:01:45 +0000 Subject: [PATCH 01/19] feat; added lesson7.ts content --- lesson_07/conditionals/src/lesson7.ts | 75 +++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 9 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 52f45df8b..5fc6f6a43 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -7,9 +7,13 @@ import { computeLexicographicDistance } from "./util.js"; * @return True if the age corresponds to a voting age and false otherwise. */ export function canVote(age: number): boolean { - return false; -} + if( age >= 18 ){ + return true; + } else { + return false; + } +} /** * Compares two strings lexicographically. * @@ -24,7 +28,13 @@ export function compareStrings(a: string, b: string): number { // TODO(you): Finish this method. - return 0; + if(a < b){ + return -1; + } if(a > b){ + return 1; + }else{ + return 0; + } } /** @@ -37,7 +47,31 @@ export function compareStrings(a: string, b: string): number { * @return The letter grade ("A+", "A", "A-", "B+", etc.). */ export function convertGpaToLetterGrade(gpa: number): string { - return "F"; + if(gpa >= 97){ + return "A+" + }if(gpa >= 93){ + return "A" + }if(gpa >= 90){ + return "A-" + }if(gpa >= 87){ + return "B+" + }if(gpa >= 83){ + return "B" + }if(gpa >= 80){ + return "B-" + }if(gpa >= 77){ + return "C+" + }if(gpa >= 73){ + return "C" + }if(gpa >= 70){ + return "C-"; + }if(gpa >= 67){ + return "D+"; + }if(gpa >= 65){ + return "D-"; + }else{ + return "F" + } } /** @@ -47,7 +81,11 @@ export function convertGpaToLetterGrade(gpa: number): string { * @return The factorial of n. */ export function computeFactorial(n: number): number { - return 0; + let totalValue = 1 + for(let i = 1; n >= i; i++){ + totalValue *= i + } + return totalValue; } /** @@ -57,7 +95,11 @@ export function computeFactorial(n: number): number { * @return The sum of all the values. */ export function addNumbers(values: number[]): number { - return 0; + let sum = 0 + for(let i = 0; i < values.length; i++){ + sum += values[i]; + } + return sum; } /** @@ -67,7 +109,17 @@ export function addNumbers(values: number[]): number { * @return An array containing the first `n` Fibonacci values. */ export function getFirstNFibonacciNumbers(n: number): number[] { - return []; + let array = [n] + + if(n <= 0){ + return array; + } + + for(let i = 2; i < n; i++){ + let cont = array[i - 1] + array[i - 2]; + array.push(cont) + } + return array; } /** @@ -93,10 +145,15 @@ export function binarySearch( const pivotIndex = Math.floor((start + end) / 2); // The index in the middle of the array. // TODO(you): Finish implementing this algorithm - + if (values[pivotIndex] === value){ + return pivotIndex; + } if (values[pivotIndex] < value){ + return binarySearch(values, start, pivotIndex - 1, value); + } else { + return binarySearch(values, pivotIndex - 1, end, value); + } // If values[pivotIndex] is equal to value then return `pivotIndex`. // Else if values[pivotIndex] is greater than the value, then // call `binarySearch(values, start, pivotIndex - 1, value)` and return its value; // Else call `binarySearch(values, pivotIndex + 1, end, value)` and return its value. - return -1; } From a0ceba6118e0d6429ed8e711daf74e3df2077520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 17:47:45 +0000 Subject: [PATCH 02/19] fix: changed 'let' to 'const' on l.119 & l.126; implemented 'distance' into code on l.31 l.33; used 'for-of' loop instead of 'for' loop on l.104; --- lesson_07/conditionals/src/lesson7.ts | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 5fc6f6a43..02672d050 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -28,9 +28,9 @@ export function compareStrings(a: string, b: string): number { // TODO(you): Finish this method. - if(a < b){ + if(distance < 0){ return -1; - } if(a > b){ + } if(distance > 0){ return 1; }else{ return 0; @@ -95,10 +95,13 @@ export function computeFactorial(n: number): number { * @return The sum of all the values. */ export function addNumbers(values: number[]): number { - let sum = 0 - for(let i = 0; i < values.length; i++){ - sum += values[i]; + + let sum = 0; + + for(const i of values){ + sum += i; } + return sum; } @@ -109,14 +112,14 @@ export function addNumbers(values: number[]): number { * @return An array containing the first `n` Fibonacci values. */ export function getFirstNFibonacciNumbers(n: number): number[] { - let array = [n] + const array = [n] if(n <= 0){ return array; } for(let i = 2; i < n; i++){ - let cont = array[i - 1] + array[i - 2]; + const cont = array[i - 1] + array[i - 2]; array.push(cont) } return array; From e5007e43822a212e34b1a04ea9b35eeee76815ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 18:28:13 +0000 Subject: [PATCH 03/19] fix: converted 'if' statements into 'else if' statements l.53-71; removed 'return array' if 'n = 0'; corrected formatting on binarySearch ; --- lesson_07/conditionals/src/lesson7.ts | 34 +++++++++++++-------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 02672d050..9ececb41b 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -47,28 +47,29 @@ export function compareStrings(a: string, b: string): number { * @return The letter grade ("A+", "A", "A-", "B+", etc.). */ export function convertGpaToLetterGrade(gpa: number): string { + if(gpa >= 97){ return "A+" - }if(gpa >= 93){ + }else if(gpa >= 93){ return "A" - }if(gpa >= 90){ + }else if(gpa >= 90){ return "A-" - }if(gpa >= 87){ + }else if(gpa >= 87){ return "B+" - }if(gpa >= 83){ + }else if(gpa >= 83){ return "B" - }if(gpa >= 80){ + }else if(gpa >= 80){ return "B-" - }if(gpa >= 77){ + }else if(gpa >= 77){ return "C+" - }if(gpa >= 73){ + }else if(gpa >= 73){ return "C" - }if(gpa >= 70){ + }else if(gpa >= 70){ return "C-"; - }if(gpa >= 67){ + }else if(gpa >= 67){ return "D+"; - }if(gpa >= 65){ - return "D-"; + }else if(gpa >= 65){ + return "D"; }else{ return "F" } @@ -81,7 +82,9 @@ export function convertGpaToLetterGrade(gpa: number): string { * @return The factorial of n. */ export function computeFactorial(n: number): number { + let totalValue = 1 + for(let i = 1; n >= i; i++){ totalValue *= i } @@ -112,12 +115,9 @@ export function addNumbers(values: number[]): number { * @return An array containing the first `n` Fibonacci values. */ export function getFirstNFibonacciNumbers(n: number): number[] { + const array = [n] - if(n <= 0){ - return array; - } - for(let i = 2; i < n; i++){ const cont = array[i - 1] + array[i - 2]; array.push(cont) @@ -150,10 +150,10 @@ export function binarySearch( // TODO(you): Finish implementing this algorithm if (values[pivotIndex] === value){ return pivotIndex; - } if (values[pivotIndex] < value){ + } if (values[pivotIndex] > value){ return binarySearch(values, start, pivotIndex - 1, value); } else { - return binarySearch(values, pivotIndex - 1, end, value); + return binarySearch(values, pivotIndex + 1, end, value); } // If values[pivotIndex] is equal to value then return `pivotIndex`. // Else if values[pivotIndex] is greater than the value, then From 42534de0df2df5cba412c66ee9700a9c876bef82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 20:00:40 +0000 Subject: [PATCH 04/19] fix: converted scale from % to 4.0 l.53-71; 'included correct 'if' statement for 'n==0'; --- lesson_07/conditionals/src/lesson7.ts | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 9ececb41b..ee7b158a6 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,27 +48,27 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa >= 97){ + if(gpa >= 4.0){ return "A+" - }else if(gpa >= 93){ + }else if(gpa >= 4.0){ return "A" - }else if(gpa >= 90){ + }else if(gpa >= 3.7){ return "A-" - }else if(gpa >= 87){ + }else if(gpa >= 3.3){ return "B+" - }else if(gpa >= 83){ + }else if(gpa >= 3.0){ return "B" - }else if(gpa >= 80){ + }else if(gpa >= 2.7){ return "B-" - }else if(gpa >= 77){ + }else if(gpa >= 2.3){ return "C+" - }else if(gpa >= 73){ + }else if(gpa >= 2.0){ return "C" - }else if(gpa >= 70){ + }else if(gpa >= 1.7){ return "C-"; - }else if(gpa >= 67){ + }else if(gpa >= 1.3){ return "D+"; - }else if(gpa >= 65){ + }else if(gpa >= 1.0){ return "D"; }else{ return "F" @@ -117,7 +117,9 @@ export function addNumbers(values: number[]): number { export function getFirstNFibonacciNumbers(n: number): number[] { const array = [n] - + if (n == 0){ + return array; + } for(let i = 2; i < n; i++){ const cont = array[i - 1] + array[i - 2]; array.push(cont) From 51070a975dbce51ffd6529b1b13781a9f72b92d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 20:17:01 +0000 Subject: [PATCH 05/19] feat: added condition for 'if (n <= 0){} --- lesson_07/conditionals/src/lesson7.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index ee7b158a6..bb4df15cd 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -116,9 +116,12 @@ export function addNumbers(values: number[]): number { */ export function getFirstNFibonacciNumbers(n: number): number[] { - const array = [n] - if (n == 0){ - return array; + const array = [1,1] + + if (n <= 0){ + return []; + }else if(n === 1){ + return [1] } for(let i = 2; i < n; i++){ const cont = array[i - 1] + array[i - 2]; From a7d16ad924ae1d0c3f826128fe7903e75843f6f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 20:35:08 +0000 Subject: [PATCH 06/19] fix: corrected scale values l.53-71; --- lesson_07/conditionals/src/lesson7.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index bb4df15cd..29ba7f58d 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -50,7 +50,7 @@ export function convertGpaToLetterGrade(gpa: number): string { if(gpa >= 4.0){ return "A+" - }else if(gpa >= 4.0){ + }else if(gpa >= 3.9){ return "A" }else if(gpa >= 3.7){ return "A-" @@ -66,7 +66,7 @@ export function convertGpaToLetterGrade(gpa: number): string { return "C" }else if(gpa >= 1.7){ return "C-"; - }else if(gpa >= 1.3){ + }else if(gpa > 1.3){ return "D+"; }else if(gpa >= 1.0){ return "D"; @@ -116,8 +116,8 @@ export function addNumbers(values: number[]): number { */ export function getFirstNFibonacciNumbers(n: number): number[] { - const array = [1,1] - + const array = [1, 1] + if (n <= 0){ return []; }else if(n === 1){ From 58193ddb0e173bb27e50615524b93f7433fd0e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 20:40:52 +0000 Subject: [PATCH 07/19] fix: corrected A to A+ scale; --- lesson_07/conditionals/src/lesson7.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 29ba7f58d..0e21fb7c1 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,7 +48,7 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa >= 4.0){ + if(gpa > 4.0){ return "A+" }else if(gpa >= 3.9){ return "A" From 88ef56bd713d098df9ba6cda6730a4e103533753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 21:17:46 +0000 Subject: [PATCH 08/19] fix: updated scale values; --- lesson_07/conditionals/src/lesson7.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 0e21fb7c1..fcaa76485 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,27 +48,27 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa > 4.0){ + if(gpa >= 3.9){ return "A+" - }else if(gpa >= 3.9){ - return "A" }else if(gpa >= 3.7){ - return "A-" + return "A" }else if(gpa >= 3.3){ - return "B+" + return "A-" }else if(gpa >= 3.0){ - return "B" + return "B+" }else if(gpa >= 2.7){ - return "B-" + return "B" }else if(gpa >= 2.3){ + return "B-" + }else if(gpa >= 2.0){ return "C+" - }else if(gpa >= 2.0){ + }else if(gpa >= 1.7){ return "C" - }else if(gpa >= 1.7){ + }else if(gpa >= 1.3){ return "C-"; - }else if(gpa > 1.3){ + }else if(gpa > 1.0){ return "D+"; - }else if(gpa >= 1.0){ + }else if(gpa >= 0.7){ return "D"; }else{ return "F" From 28d418e191fc052c63dc663048a2c58ee88de900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 21:22:42 +0000 Subject: [PATCH 09/19] test: testing gpa scale value (tgsv.v1) --- lesson_07/conditionals/src/lesson7.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index fcaa76485..5bbbd9b7c 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,10 +48,8 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa >= 3.9){ - return "A+" - }else if(gpa >= 3.7){ - return "A" + if(gpa >= 3.7){ + return "A" }else if(gpa >= 3.3){ return "A-" }else if(gpa >= 3.0){ From 54605f2ec27e84b96a246259ad444c5709a98971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 21:26:13 +0000 Subject: [PATCH 10/19] (tgsv.v2); --- lesson_07/conditionals/src/lesson7.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 5bbbd9b7c..723caf0a3 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,25 +48,25 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa >= 3.7){ + if(gpa > 3.7){ return "A" - }else if(gpa >= 3.3){ + }else if(gpa > 3.3){ return "A-" - }else if(gpa >= 3.0){ + }else if(gpa > 3.0){ return "B+" - }else if(gpa >= 2.7){ + }else if(gpa > 2.7){ return "B" - }else if(gpa >= 2.3){ + }else if(gpa > 2.3){ return "B-" - }else if(gpa >= 2.0){ + }else if(gpa > 2.0){ return "C+" - }else if(gpa >= 1.7){ + }else if(gpa > 1.7){ return "C" - }else if(gpa >= 1.3){ + }else if(gpa > 1.3){ return "C-"; }else if(gpa > 1.0){ return "D+"; - }else if(gpa >= 0.7){ + }else if(gpa > 0.7){ return "D"; }else{ return "F" From cb2e3b46e2820166013f048cbe9e2ffec53a9339 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Fri, 11 Oct 2024 21:33:54 +0000 Subject: [PATCH 11/19] test: (tgsv.v3); --- lesson_07/conditionals/src/lesson7.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 723caf0a3..d87b966ad 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,25 +48,25 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa > 3.7){ + if(gpa >= 3.7){ return "A" - }else if(gpa > 3.3){ + }else if(gpa >= 3.3){ return "A-" - }else if(gpa > 3.0){ + }else if(gpa >= 3.0){ return "B+" - }else if(gpa > 2.7){ + }else if(gpa >= 2.7){ return "B" - }else if(gpa > 2.3){ + }else if(gpa >= 2.3){ return "B-" - }else if(gpa > 2.0){ + }else if(gpa >= 2.0){ return "C+" - }else if(gpa > 1.7){ + }else if(gpa >= 1.7){ return "C" - }else if(gpa > 1.3){ + }else if(gpa >= 1.3){ return "C-"; - }else if(gpa > 1.0){ + }else if(gpa >= 1.0){ return "D+"; - }else if(gpa > 0.7){ + }else if(gpa >= 0.7){ return "D"; }else{ return "F" From d74c27af315a050bc0fef8cc22884e2929cf96fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 01:48:13 +0000 Subject: [PATCH 12/19] test:(tgsv.4) --- lesson_07/conditionals/src/lesson7.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index d87b966ad..5a20b2af6 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,7 +48,7 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa >= 3.7){ + if(gpa > 3.8){ return "A" }else if(gpa >= 3.3){ return "A-" From ef2a1dd1fe1fa5f09f4b4cfb98fb81f0b156e1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 01:50:43 +0000 Subject: [PATCH 13/19] test:(tgsv.5) --- lesson_07/conditionals/src/lesson7.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 5a20b2af6..1153e3448 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,7 +48,7 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa > 3.8){ + if(gpa > 3.9){ return "A" }else if(gpa >= 3.3){ return "A-" From 87887b1da08a338b0a9f448b48aa606983bdafce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:24:00 +0000 Subject: [PATCH 14/19] fix: added additional parameters in 'else-if' statements to correct errors; --- lesson_07/conditionals/src/lesson7.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 1153e3448..fd9e6214b 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,25 +48,25 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa > 3.9){ + if(gpa > 4.0){ return "A" - }else if(gpa >= 3.3){ + }else if(gpa >= 3.7 && gpa < 4.0) { return "A-" - }else if(gpa >= 3.0){ + }else if(gpa >= 3.3 && gpa < 3.7){ return "B+" - }else if(gpa >= 2.7){ + }else if(gpa >= 3 && gpa < 3.3){ return "B" - }else if(gpa >= 2.3){ + }else if(gpa >= 2.7 && gpa < 3){ return "B-" - }else if(gpa >= 2.0){ + }else if(gpa >= 2.3 && gpa < 3.7){ return "C+" - }else if(gpa >= 1.7){ + }else if(gpa >= 2 && gpa < 2.3){ return "C" - }else if(gpa >= 1.3){ + }else if(gpa >= 1.7 && gpa < 2){ return "C-"; - }else if(gpa >= 1.0){ + }else if(gpa >= 1.3 && gpa < 1.7){ return "D+"; - }else if(gpa >= 0.7){ + }else if(gpa >= 1.0 && gpa < 1.3){ return "D"; }else{ return "F" From 1eb4434ba12f0bb7cf7bc2d3f66e4d70a5916e28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:26:52 +0000 Subject: [PATCH 15/19] fix: added fixes to the final 'else-if' statement --- lesson_07/conditionals/src/lesson7.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index fd9e6214b..d5e09cddc 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -68,7 +68,7 @@ export function convertGpaToLetterGrade(gpa: number): string { return "D+"; }else if(gpa >= 1.0 && gpa < 1.3){ return "D"; - }else{ + }else if(gpa < 1.0){ return "F" } } From b69ab2eb323fecea9b6562ea51f1c2dbc16b6ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:30:48 +0000 Subject: [PATCH 16/19] fix: added ';' to the 'else-if' statements; --- lesson_07/conditionals/src/lesson7.ts | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index d5e09cddc..9dc25172f 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -49,19 +49,19 @@ export function compareStrings(a: string, b: string): number { export function convertGpaToLetterGrade(gpa: number): string { if(gpa > 4.0){ - return "A" + return "A"; }else if(gpa >= 3.7 && gpa < 4.0) { - return "A-" + return "A-"; }else if(gpa >= 3.3 && gpa < 3.7){ - return "B+" + return "B+"; }else if(gpa >= 3 && gpa < 3.3){ - return "B" + return "B"; }else if(gpa >= 2.7 && gpa < 3){ - return "B-" + return "B-"; }else if(gpa >= 2.3 && gpa < 3.7){ - return "C+" + return "C+"; }else if(gpa >= 2 && gpa < 2.3){ - return "C" + return "C"; }else if(gpa >= 1.7 && gpa < 2){ return "C-"; }else if(gpa >= 1.3 && gpa < 1.7){ @@ -69,7 +69,7 @@ export function convertGpaToLetterGrade(gpa: number): string { }else if(gpa >= 1.0 && gpa < 1.3){ return "D"; }else if(gpa < 1.0){ - return "F" + return "F"; } } From a4056a929712c286e3ea6216ec7b2e4417111848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:32:48 +0000 Subject: [PATCH 17/19] fix: removed fixes to the final 'else-if' statement --- lesson_07/conditionals/src/lesson7.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 9dc25172f..115e50ea8 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -68,7 +68,7 @@ export function convertGpaToLetterGrade(gpa: number): string { return "D+"; }else if(gpa >= 1.0 && gpa < 1.3){ return "D"; - }else if(gpa < 1.0){ + }else { return "F"; } } From 18ecdcb804c1e44cb44d37581bb8dc6774d560fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:35:45 +0000 Subject: [PATCH 18/19] fix: removed final 'else-if' statement; --- lesson_07/conditionals/src/lesson7.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index 115e50ea8..d3675d796 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -54,13 +54,13 @@ export function convertGpaToLetterGrade(gpa: number): string { return "A-"; }else if(gpa >= 3.3 && gpa < 3.7){ return "B+"; - }else if(gpa >= 3 && gpa < 3.3){ + }else if(gpa >= 3.0 && gpa < 3.3){ return "B"; }else if(gpa >= 2.7 && gpa < 3){ return "B-"; }else if(gpa >= 2.3 && gpa < 3.7){ return "C+"; - }else if(gpa >= 2 && gpa < 2.3){ + }else if(gpa >= 2.0 && gpa < 2.3){ return "C"; }else if(gpa >= 1.7 && gpa < 2){ return "C-"; @@ -68,9 +68,8 @@ export function convertGpaToLetterGrade(gpa: number): string { return "D+"; }else if(gpa >= 1.0 && gpa < 1.3){ return "D"; - }else { - return "F"; } + return "F"; } /** From 0c681236dabdec8730978c3f090591b18fdf7dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CA1-4U2T1NN=E2=80=9D?= <“a1.austinn19@gmail.com”> Date: Sat, 12 Oct 2024 23:38:58 +0000 Subject: [PATCH 19/19] fix: rebuilt 'else-if' statements for converGpaToLetterGrade; --- lesson_07/conditionals/src/lesson7.ts | 32 +++++++++++++-------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/lesson_07/conditionals/src/lesson7.ts b/lesson_07/conditionals/src/lesson7.ts index d3675d796..07b25a2ff 100644 --- a/lesson_07/conditionals/src/lesson7.ts +++ b/lesson_07/conditionals/src/lesson7.ts @@ -48,28 +48,28 @@ export function compareStrings(a: string, b: string): number { */ export function convertGpaToLetterGrade(gpa: number): string { - if(gpa > 4.0){ + if (gpa >= 4.0) { return "A"; - }else if(gpa >= 3.7 && gpa < 4.0) { - return "A-"; - }else if(gpa >= 3.3 && gpa < 3.7){ - return "B+"; - }else if(gpa >= 3.0 && gpa < 3.3){ - return "B"; - }else if(gpa >= 2.7 && gpa < 3){ - return "B-"; - }else if(gpa >= 2.3 && gpa < 3.7){ - return "C+"; - }else if(gpa >= 2.0 && gpa < 2.3){ + } else if (gpa >= 3.7) { + return "A-"; + } else if (gpa >= 3.3) { + return "B+"; + } else if (gpa >= 3.0) { + return "B"; + } else if (gpa >= 2.7) { + return "B-"; + } else if (gpa >= 2.3) { + return "C+"; + } else if (gpa >= 2.0) { return "C"; - }else if(gpa >= 1.7 && gpa < 2){ + } else if (gpa >= 1.7) { return "C-"; - }else if(gpa >= 1.3 && gpa < 1.7){ + } else if (gpa >= 1.3) { return "D+"; - }else if(gpa >= 1.0 && gpa < 1.3){ + } else if (gpa >= 1.0) { return "D"; } - return "F"; + return "F"; } /**