Skip to content

Commit e7d0002

Browse files
I added changes to the implemented functions
1 parent 8f148b8 commit e7d0002

3 files changed

Lines changed: 36 additions & 40 deletions

File tree

Sprint-3/1-implement-and-rewrite-tests/implement/1-get-angle-type.js

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,18 @@
1616

1717
function getAngleType(angle) {
1818
if (angle > 0 && angle < 90) {
19-
return 'Acute angle';
19+
return "Acute angle";
20+
} else if (angle === 90) {
21+
return "Right angle";
22+
} else if (angle > 90 && angle < 180) {
23+
return "Obtuse angle";
24+
} else if (angle === 180) {
25+
return "Stright angle";
26+
} else if (angle > 180 && angle < 360) {
27+
return "Reflex angle";
28+
} else {
29+
return "Invalid angle";
2030
}
21-
else if (angle===90) {
22-
return 'Right angle';
23-
}
24-
else if ( angle > 90 && angle < 180){
25-
return 'Obtuse angle';
26-
}
27-
else if( angle === 180) {
28-
return 'Stright angle';
29-
}
30-
else if (angle > 180 && angle < 360) {
31-
return 'Reflex angle';
32-
}
33-
else {return 'Invalid angle';}
3431

3532
// TODO: Implement this function
3633
}
@@ -52,31 +49,31 @@ function assertEquals(actualOutput, targetOutput) {
5249
// Example: Identify Right Angles
5350
// const right = getAngleType(90);
5451
// assertEquals(right, "Right angle");
55-
assertEquals (getAngleType(90), "Right angle");
52+
assertEquals(getAngleType(90), "Right angle");
5653

5754
// const acute = getAngleType(45);
5855
// assertEquals(acute, "Acute angle");
59-
assertEquals (getAngleType(45),"Acute angle");
56+
assertEquals(getAngleType(45), "Acute angle");
6057

6158
// const obtuse = getAngleType(120);
6259
// assertEquals(obtuse, "Obtuse angle");
63-
assertEquals (getAngleType(120),"Obtuse angle");
60+
assertEquals(getAngleType(120), "Obtuse angle");
6461

6562
// const stright = getAngleType(180);
6663
// assertEquals(stright, "Stright angle");
67-
assertEquals (getAngleType(180),"Stright angle");
64+
assertEquals(getAngleType(180), "Stright angle");
6865
// const reflex = getAngleType(270);
6966
// assertEquals(reflex, "Reflex angle");
70-
assertEquals (getAngleType(270),"Reflex angle");
67+
assertEquals(getAngleType(270), "Reflex angle");
7168

7269
// const invalid = getAngleType(360);
7370
// assertEquals(invalid, "Invalid angle");
74-
assertEquals (getAngleType(360),"Invalid angle");
71+
assertEquals(getAngleType(360), "Invalid angle");
7572
//Boundary cases
7673
// const invalid = getAngleType(0);
7774
// assertEquals(invalid, "Invalid angle");
78-
assertEquals (getAngleType(0),"Invalid angle");
79-
//Outside range
75+
assertEquals(getAngleType(0), "Invalid angle");
76+
//Outside range
8077
// const invalid = getAngleType(-10 , 400);
8178
// assertEquals(invalid, "Invalid angle");
82-
assertEquals (getAngleType(-10 , 400),"Invalid angle");
79+
assertEquals(getAngleType(-10, 400), "Invalid angle");

Sprint-3/1-implement-and-rewrite-tests/implement/2-is-proper-fraction.js

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@
1111
// execute the code to ensure all tests pass.
1212

1313
function isProperFraction(numerator, denominator) {
14-
if( numerator < denominator) {
15-
return true;
16-
}
17-
else {return false; }
14+
if (denominator === 0) return false;
1815

19-
// TODO: Implement this function
16+
return Math.abs(numerator) < Math.abs(denominator);
2017
}
2118

19+
// TODO: Implement this function
20+
2221
// The line below allows us to load the isProperFraction function into tests in other files.
2322
// This will be useful in the "rewrite tests with jest" step.
2423
module.exports = isProperFraction;
@@ -37,17 +36,19 @@ function assertEquals(actualOutput, targetOutput) {
3736
// Example: 1/2 is a proper fraction
3837
assertEquals(isProperFraction(1, 2), true);
3938
// inproper fraction:
40-
assertEquals (isProperFraction(5, 3), false );
39+
assertEquals(isProperFraction(5, 3), false);
4140

4241
// equal numbers
43-
assertEquals (isProperFraction(4, 4), false );
42+
assertEquals(isProperFraction(4, 4), false);
4443

4544
// negative numbers
46-
assertEquals (isProperFraction(-2, 4), true );
47-
assertEquals (isProperFraction(5, -4), false );
48-
assertEquals (isProperFraction (-3,-5), false);
45+
assertEquals(isProperFraction(-2, 4), true);
46+
assertEquals(isProperFraction(5, -4), false);
47+
assertEquals(isProperFraction(-3, -5), false);
48+
assertEquals(isProperFraction(-1, 2), true);
49+
assertEquals(isProperFraction(-1, 2), true);
4950

5051
// special case
51-
assertEquals(isProperFraction(1,0) , false);
52+
assertEquals(isProperFraction(1, 0), false);
5253

53-
assertEquals (isProperFraction (0,5), true);
54+
assertEquals(isProperFraction(0, 5), true);

Sprint-3/1-implement-and-rewrite-tests/implement/3-get-card-value.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ function getCardValue(card) {
3737
return 10;
3838
}
3939

40-
if (rank >= "2" && rank <= "10") {
40+
if (Number(rank) >= 2 && Number(rank) <= 10) {
4141
return Number(rank);
4242
}
4343

4444
throw new Error("Invalid card");
4545
}
4646

47-
// TODO: Implement this function
48-
47+
// TODO: Implement this function
4948

5049
// The line below allows us to load the getCardValue function into tests in other files.
5150
// This will be useful in the "rewrite tests with jest" step.
@@ -81,7 +80,6 @@ try {
8180
console.error("Error was not thrown for invalid card");
8281
} catch (e) {}
8382

84-
8583
// What other invalid card cases can you think of?
8684

8785
const invalidCards = ["invalid", "1♠", "B♣", "10?", "Z♠"];
@@ -92,4 +90,4 @@ for (const card of invalidCards) {
9290
} catch (e) {
9391
// Expected error, do nothing
9492
}
95-
}
93+
}

0 commit comments

Comments
 (0)