-
-
Notifications
You must be signed in to change notification settings - Fork 239
Glasgow | 25-ITP-Sep | Hanna Mykytiuk | Sprint 3 | Stretch #816
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,22 @@ function getAngleType(angle) { | |
| if (angle === 90) { | ||
| return "Right angle"; | ||
| } | ||
| else if (angle < 90) { | ||
| return "Acute angle"; | ||
| } | ||
| else if (angle > 90 && angle < 180){ | ||
| return "Obtuse angle"; | ||
| } | ||
| else if ( angle === 180){ | ||
| return "Straight angle"; | ||
| } | ||
| else if (angle > 180 && angle < 360) { | ||
| return "Reflex angle"; | ||
| } | ||
| else { | ||
| return "invalid angle"; | ||
| } | ||
|
|
||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @HannaOdud Any thoughts on how we might handle invalid angles (like negatives or values over 360)? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks, I have changed it. |
||
| // Run the tests, work out what Case 2 is testing, and implement the required code here. | ||
| // Then keep going for the other cases, one at a time. | ||
| } | ||
|
|
@@ -50,14 +66,19 @@ assertEquals(acute, "Acute angle"); | |
| // When the angle is greater than 90 degrees and less than 180 degrees, | ||
| // Then the function should return "Obtuse angle" | ||
| const obtuse = getAngleType(120); | ||
| assertEquals(obtuse,"Obtuse angle"); | ||
| // ====> write your test here, and then add a line to pass the test in the function above | ||
|
|
||
| // Case 4: Identify Straight Angles: | ||
| // When the angle is exactly 180 degrees, | ||
| // Then the function should return "Straight angle" | ||
| // ====> write your test here, and then add a line to pass the test in the function above | ||
| const straight = getAngleType(180); | ||
| assertEquals(straight, "Straight angle"); | ||
|
|
||
| // Case 5: Identify Reflex Angles: | ||
| // When the angle is greater than 180 degrees and less than 360 degrees, | ||
| // Then the function should return "Reflex angle" | ||
| // ====> write your test here, and then add a line to pass the test in the function above | ||
| // ====> write your test here, and then add a line to pass the test in the function above | ||
| const reflex = getAngleType(190); | ||
| assertEquals(reflex, "Reflex angle" ); | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,9 +8,7 @@ | |
| // write one test at a time, and make it pass, build your solution up methodically | ||
|
|
||
| function isProperFraction(numerator, denominator) { | ||
| if (numerator < denominator) { | ||
| return true; | ||
| } | ||
| return (Math.abs(numerator) < Math.abs(denominator)) | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nice!!!! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks! |
||
| } | ||
|
|
||
| // The line below allows us to load the isProperFraction function into tests in other files. | ||
|
|
@@ -46,14 +44,21 @@ assertEquals(improperFraction, false); | |
| // target output: true | ||
| // Explanation: The fraction -4/7 is a proper fraction because the absolute value of the numerator (4) is less than the denominator (7). The function should return true. | ||
| const negativeFraction = isProperFraction(-4, 7); | ||
| assertEquals(negativeFraction,true) | ||
| // ====> complete with your assertion | ||
|
|
||
| // Equal Numerator and Denominator check: | ||
| // Input: numerator = 3, denominator = 3 | ||
| // target output: false | ||
| // Explanation: The fraction 3/3 is not a proper fraction because the numerator is equal to the denominator. The function should return false. | ||
| const equalFraction = isProperFraction(3, 3); | ||
| assertEquals(equalFraction,false); | ||
| // ====> complete with your assertion | ||
|
|
||
| // Stretch: | ||
| // What other scenarios could you test for? | ||
| const bothNegativeProperFraction = isProperFraction(-3, -5); | ||
| assertEquals(bothNegativeProperFraction,true); | ||
| // | ||
| const bothNegativeNotProperFraction = isProperFraction(-6, -5); | ||
| assertEquals(bothNegativeNotProperFraction,false); | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,9 +8,23 @@ | |
| // write one test at a time, and make it pass, build your solution up methodically | ||
| // just make one change at a time -- don't rush -- programmers are deep and careful thinkers | ||
| function getCardValue(card) { | ||
| let rank = card.slice(0, -1); | ||
| let intPart; | ||
| if (!isNaN(rank)){ | ||
| intPart = parseInt(rank); | ||
| } | ||
| if (rank === "A") { | ||
| return 11; | ||
| } | ||
| else if (intPart >= 2 && intPart && intPart < 11){ | ||
| return parseInt(rank) | ||
| } | ||
| else if(["J", "Q", "K"].includes(rank)) { | ||
| return 10; | ||
| } | ||
| else{ | ||
| throw new Error("Invalid card rank."); | ||
| } | ||
| } | ||
|
|
||
| // The line below allows us to load the getCardValue function into tests in other files. | ||
|
|
@@ -39,19 +53,34 @@ assertEquals(aceofSpades, 11); | |
| // When the function is called with such a card, | ||
| // Then it should return the numeric value corresponding to the rank (e.g., "5" should return 5). | ||
| const fiveofHearts = getCardValue("5♥"); | ||
| assertEquals(fiveofHearts, 5); | ||
| // ====> write your test here, and then add a line to pass the test in the function above | ||
|
|
||
| // Handle Face Cards (J, Q, K): | ||
| // Given a card with a rank of "10," "J," "Q," or "K", | ||
| // When the function is called with such a card, | ||
| // Then it should return the value 10, as these cards are worth 10 points each in blackjack. | ||
| const cardOfJ = getCardValue("J♥"); | ||
| assertEquals(cardOfJ, 10); | ||
| const cardOfQ = getCardValue("Q♠"); | ||
| assertEquals(cardOfQ, 10); | ||
| const cardOfK = getCardValue("K♠"); | ||
| assertEquals(cardOfK, 10); | ||
|
|
||
| // Handle Ace (A): | ||
| // Given a card with a rank of "A", | ||
| // When the function is called with an Ace, | ||
| // Then it should, by default, assume the Ace is worth 11 points, which is a common rule in blackjack. | ||
| const aceOfHeart = getCardValue("A♥"); | ||
| assertEquals(aceOfHeart, 11); | ||
|
|
||
| // Handle Invalid Cards: | ||
| // Given a card with an invalid rank (neither a number nor a recognized face card), | ||
| // When the function is called with such a card, | ||
| // Then it should throw an error indicating "Invalid card rank." | ||
| try { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You’re on the right track with This way, you’re checking that the error message matches exactly what your function throws. |
||
| getCardValue("W♥"); | ||
| console.log("❌ Test failed: no error thrown"); | ||
| } catch (error) { | ||
| assertEquals(error.message, "Invalid card rank."); | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@HannaOdud Great job! You’ve implemented all five cases correctly. Your logic is solid and the code reads clearly
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks a lot!