Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/area_shape.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ double trapezoidArea(double largerBase, double smallerBase, double height)
double regularPolygonArea(double side, int nOfSides)
{
double apothen, perimeter, result;
assert(side > 0 && nOfSides > 0);
assert(side > 0 && nOfSides >= 3);
apothen = side / (2 * tan(M_PI / nOfSides));
perimeter = side * nOfSides;
result = perimeter * apothen / 2;
Expand Down
10 changes: 5 additions & 5 deletions src/geometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ double *midpointPoints(double ax, double ay, double bx, double by)
double slopeOfLine(double x1, double y1, double x2, double y2)
{
double result;
assert(x1 != x2 || y1 != y2);
assert(x1 != x2);
result = (y2 - y1) / (x2 - x1);
return result;
}
Expand Down Expand Up @@ -156,7 +156,7 @@ double circlePerimeter(double radius)
int nOfDiagnonalsPolygon(int nOfSides)
{
double result;
assert(nOfSides > 0);
assert(nOfSides >= 3);
result = nOfSides * (nOfSides - 3) / 2;
return result;
}
Expand All @@ -171,7 +171,7 @@ int nOfDiagnonalsPolygon(int nOfSides)
double convexPolygonSumInteriorAngles(double nOfSides)
{
double result;
assert(nOfSides > 0);
assert(nOfSides >= 3);
result = (nOfSides - 2) * M_PI;
return result;
}
Expand All @@ -187,7 +187,7 @@ double convexPolygonSumInteriorAngles(double nOfSides)
double regularPolygonInteriorAngle(int nOfSides)
{
double result;
assert(nOfSides > 0);
assert(nOfSides >= 3);
result = convexPolygonSumInteriorAngles(nOfSides) / nOfSides;
return result;
}
Expand All @@ -202,7 +202,7 @@ double regularPolygonInteriorAngle(int nOfSides)
double convexPolygonExteriorAngle(int nOfSides)
{
double result;
assert(nOfSides > 0);
assert(nOfSides >= 3);
result = 2 * M_PI / nOfSides;
return result;
}
Expand Down
4 changes: 4 additions & 0 deletions src/test/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,10 @@ int main()
test(185, round(radians2degrees(regularPolygonInteriorAngle(6))) == 120);
test(186, round(radians2degrees(convexPolygonExteriorAngle(5))) == 72);
test(187, round(radians2degrees(convexPolygonExteriorAngle(6))) == 60);
test(188, nOfDiagnonalsPolygon(3) == 0);
test(189, round(radians2degrees(convexPolygonSumInteriorAngles(3))) == 180);
test(190, round(radians2degrees(regularPolygonInteriorAngle(3))) == 60);
test(191, round(radians2degrees(convexPolygonExteriorAngle(3))) == 120);

puts("Passed all tests successfully!");

Expand Down
2 changes: 1 addition & 1 deletion src/trigonometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ double hypotenuse(double sideA, double sideB)
double sideRightTriangle(double hypotenuse, double sideA)
{
double result;
assert(sideA > 0 && hypotenuse > 0);
assert(sideA > 0 && hypotenuse > sideA);
result = sqrt(pow(hypotenuse, 2) - pow(sideA, 2));
return result;
}
Expand Down