Skip to content
Closed
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
21 changes: 21 additions & 0 deletions src/main/java/com/thealgorithms/maths/Area.java
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,14 @@
return 4 * Math.PI * radius * radius;
}

/**

Check failure on line 72 in src/main/java/com/thealgorithms/maths/Area.java

View workflow job for this annotation

GitHub Actions / build

(javadoc) InvalidJavadocPosition: Javadoc comment is placed in the wrong location.
* Calculate the surface area of a pyramid with a square base.
*
* @param sideLength side length of the square base
* @param slantHeight slant height of the pyramid
* @return surface area of the given pyramid
*/
/*
public static double surfaceAreaPyramid(final double sideLength, final double slantHeight) {
if (sideLength <= 0) {
throw new IllegalArgumentException("");
Expand All @@ -87,6 +88,7 @@
double lateralSurfaceArea = 2 * sideLength * slantHeight;
return baseArea + lateralSurfaceArea;
}
*/

/**
* Calculate the area of a rectangle.
Expand Down Expand Up @@ -232,4 +234,23 @@
}
return Math.PI * radius * (radius + Math.pow(height * height + radius * radius, 0.5));
}

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lab 06 Commit

/**
* Calculate the surface area of a pyramid with a square base
*
* @param sideLength
* @param slantHeight
* @return surface area of the pyramid
*/
public static double surfaceAreaPyramid(final double sideLength, final double slantHeight) {
if (sideLength <= 0) {
throw new IllegalArgumentException("Must be a positive sideLength");
}
if (slantHeight <= 0) {
throw new IllegalArgumentException("Must be a positive slantHeight");
}
double baseArea = sideLength * sideLength;
double lateralSurfaceArea = 2 * sideLength * slantHeight;
return baseArea + lateralSurfaceArea;
}
}
Loading