mirror of
https://github.com/TheAlgorithms/Java.git
synced 2026-03-13 08:40:43 +08:00
* fix:shape's dimension constraints added correctyl (issue id: #7260) * fix: base changed to baseLength for better understanding * fix: base changed to baseLength for better understanding * base changed to baseLength for better understanding * fix:cleared some format issues * fix:cleared some format issues
This commit is contained in:
@@ -10,17 +10,17 @@ public final class Area {
|
||||
/**
|
||||
* String of IllegalArgumentException for radius
|
||||
*/
|
||||
private static final String POSITIVE_RADIUS = "Must be a positive radius";
|
||||
private static final String POSITIVE_RADIUS = "Radius must be greater than 0";
|
||||
|
||||
/**
|
||||
* String of IllegalArgumentException for height
|
||||
*/
|
||||
private static final String POSITIVE_HEIGHT = "Must be a positive height";
|
||||
private static final String POSITIVE_HEIGHT = "Height must be greater than 0";
|
||||
|
||||
/**
|
||||
* String of IllegalArgumentException for base
|
||||
*/
|
||||
private static final String POSITIVE_BASE = "Must be a positive base";
|
||||
private static final String POSITIVE_BASE = "Base must be greater than 0";
|
||||
|
||||
/**
|
||||
* Calculate the surface area of a cube.
|
||||
@@ -30,7 +30,7 @@ public final class Area {
|
||||
*/
|
||||
public static double surfaceAreaCube(final double sideLength) {
|
||||
if (sideLength <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive sideLength");
|
||||
throw new IllegalArgumentException("Side length must be greater than 0");
|
||||
}
|
||||
return 6 * sideLength * sideLength;
|
||||
}
|
||||
@@ -57,10 +57,10 @@ public final class Area {
|
||||
*/
|
||||
public static double surfaceAreaPyramid(final double sideLength, final double slantHeight) {
|
||||
if (sideLength <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive sideLength");
|
||||
throw new IllegalArgumentException("");
|
||||
}
|
||||
if (slantHeight <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive slantHeight");
|
||||
throw new IllegalArgumentException("slant height must be greater than 0");
|
||||
}
|
||||
double baseArea = sideLength * sideLength;
|
||||
double lateralSurfaceArea = 2 * sideLength * slantHeight;
|
||||
@@ -76,10 +76,10 @@ public final class Area {
|
||||
*/
|
||||
public static double surfaceAreaRectangle(final double length, final double width) {
|
||||
if (length <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive length");
|
||||
throw new IllegalArgumentException("Length must be greater than 0");
|
||||
}
|
||||
if (width <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive width");
|
||||
throw new IllegalArgumentException("Width must be greater than 0");
|
||||
}
|
||||
return length * width;
|
||||
}
|
||||
@@ -109,7 +109,7 @@ public final class Area {
|
||||
*/
|
||||
public static double surfaceAreaSquare(final double sideLength) {
|
||||
if (sideLength <= 0) {
|
||||
throw new IllegalArgumentException("Must be a positive sideLength");
|
||||
throw new IllegalArgumentException("Side Length must be greater than 0");
|
||||
}
|
||||
return sideLength * sideLength;
|
||||
}
|
||||
@@ -121,14 +121,14 @@ public final class Area {
|
||||
* @param height height of triangle
|
||||
* @return area of given triangle
|
||||
*/
|
||||
public static double surfaceAreaTriangle(final double base, final double height) {
|
||||
if (base <= 0) {
|
||||
public static double surfaceAreaTriangle(final double baseLength, final double height) {
|
||||
if (baseLength <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_BASE);
|
||||
}
|
||||
if (height <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_HEIGHT);
|
||||
}
|
||||
return base * height / 2;
|
||||
return baseLength * height / 2;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -138,14 +138,14 @@ public final class Area {
|
||||
* @param height height of a parallelogram
|
||||
* @return area of given parallelogram
|
||||
*/
|
||||
public static double surfaceAreaParallelogram(final double base, final double height) {
|
||||
if (base <= 0) {
|
||||
public static double surfaceAreaParallelogram(final double baseLength, final double height) {
|
||||
if (baseLength <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_BASE);
|
||||
}
|
||||
if (height <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_HEIGHT);
|
||||
}
|
||||
return base * height;
|
||||
return baseLength * height;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -156,17 +156,17 @@ public final class Area {
|
||||
* @param height height of trapezium
|
||||
* @return area of given trapezium
|
||||
*/
|
||||
public static double surfaceAreaTrapezium(final double base1, final double base2, final double height) {
|
||||
if (base1 <= 0) {
|
||||
public static double surfaceAreaTrapezium(final double baseLength1, final double baseLength2, final double height) {
|
||||
if (baseLength1 <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_BASE + 1);
|
||||
}
|
||||
if (base2 <= 0) {
|
||||
if (baseLength2 <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_BASE + 2);
|
||||
}
|
||||
if (height <= 0) {
|
||||
throw new IllegalArgumentException(POSITIVE_HEIGHT);
|
||||
}
|
||||
return (base1 + base2) * height / 2;
|
||||
return (baseLength1 + baseLength2) * height / 2;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user