From d89416dee90e66c84277ee73c8ad71e87a7ba024 Mon Sep 17 00:00:00 2001 From: ahmedelazab1220 Date: Sun, 29 Sep 2024 18:45:25 +0300 Subject: [PATCH 1/4] Add Function volumeFrustum To Calculate Frustum Of Cone Then Test It. --- src/main/java/com/thealgorithms/maths/Volume.java | 13 +++++++++++++ .../java/com/thealgorithms/maths/VolumeTest.java | 4 ++++ 2 files changed, 17 insertions(+) diff --git a/src/main/java/com/thealgorithms/maths/Volume.java b/src/main/java/com/thealgorithms/maths/Volume.java index 4b73f849bb81..dc056a96db60 100644 --- a/src/main/java/com/thealgorithms/maths/Volume.java +++ b/src/main/java/com/thealgorithms/maths/Volume.java @@ -90,4 +90,17 @@ public static double volumePrism(double baseArea, double height) { public static double volumePyramid(double baseArea, double height) { return (baseArea * height) / 3; } + + /** + * Calculate the volume of a frustum of a cone. + * + * @param r1 radius of the top of the frustum + * @param r2 radius of the bottom of the frustum + * @param height height of the frustum + * @return volume of the frustum + */ + public static double volumeFrustum(double r1, double r2, double height) { + return (Math.PI * height / 3) * (r1 * r1 + r2 * r2 + r1 * r2); + } + } diff --git a/src/test/java/com/thealgorithms/maths/VolumeTest.java b/src/test/java/com/thealgorithms/maths/VolumeTest.java index 1bdb3ae80040..f338aaf5d0ed 100644 --- a/src/test/java/com/thealgorithms/maths/VolumeTest.java +++ b/src/test/java/com/thealgorithms/maths/VolumeTest.java @@ -32,5 +32,9 @@ public void volume() { /* test pyramid */ assertTrue(Volume.volumePyramid(10, 3) == 10.0); + + /* test frustum */ + assertTrue(Volume.volumeFrustum(3, 5, 7) == 359.188760060433); + } } From f1fd8c1f66fd52cda1cef01162e4f1711010ba35 Mon Sep 17 00:00:00 2001 From: ahmedelazab1220 Date: Sun, 29 Sep 2024 20:55:47 +0300 Subject: [PATCH 2/4] Add Function volumeFrustumOfCone To Calculate Frustum Of Cone Then Test It. --- src/main/java/com/thealgorithms/maths/Volume.java | 2 +- src/test/java/com/thealgorithms/maths/VolumeTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/thealgorithms/maths/Volume.java b/src/main/java/com/thealgorithms/maths/Volume.java index dc056a96db60..9fd29b49c6fc 100644 --- a/src/main/java/com/thealgorithms/maths/Volume.java +++ b/src/main/java/com/thealgorithms/maths/Volume.java @@ -99,7 +99,7 @@ public static double volumePyramid(double baseArea, double height) { * @param height height of the frustum * @return volume of the frustum */ - public static double volumeFrustum(double r1, double r2, double height) { + public static double volumeFrustumOfCone(double r1, double r2, double height) { return (Math.PI * height / 3) * (r1 * r1 + r2 * r2 + r1 * r2); } diff --git a/src/test/java/com/thealgorithms/maths/VolumeTest.java b/src/test/java/com/thealgorithms/maths/VolumeTest.java index f338aaf5d0ed..01bf03b12458 100644 --- a/src/test/java/com/thealgorithms/maths/VolumeTest.java +++ b/src/test/java/com/thealgorithms/maths/VolumeTest.java @@ -34,7 +34,7 @@ public void volume() { assertTrue(Volume.volumePyramid(10, 3) == 10.0); /* test frustum */ - assertTrue(Volume.volumeFrustum(3, 5, 7) == 359.188760060433); + assertTrue(Volume.volumeFrustumOfCone(3, 5, 7) == 359.188760060433); } -} +} \ No newline at end of file From c283fce793f1c3a605b921e195d798a6c0d546d9 Mon Sep 17 00:00:00 2001 From: Ahmed Elazab <105994948+ahmedelazab1220@users.noreply.github.com> Date: Sun, 29 Sep 2024 21:24:20 +0300 Subject: [PATCH 3/4] Update VolumeTest.java --- src/test/java/com/thealgorithms/maths/VolumeTest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/java/com/thealgorithms/maths/VolumeTest.java b/src/test/java/com/thealgorithms/maths/VolumeTest.java index 01bf03b12458..7cd0c6716147 100644 --- a/src/test/java/com/thealgorithms/maths/VolumeTest.java +++ b/src/test/java/com/thealgorithms/maths/VolumeTest.java @@ -35,6 +35,5 @@ public void volume() { /* test frustum */ assertTrue(Volume.volumeFrustumOfCone(3, 5, 7) == 359.188760060433); - } -} \ No newline at end of file +} From 3834126286b61ffede2f87002c224e4acbce74e0 Mon Sep 17 00:00:00 2001 From: Ahmed Elazab <105994948+ahmedelazab1220@users.noreply.github.com> Date: Sun, 29 Sep 2024 21:26:54 +0300 Subject: [PATCH 4/4] Update Volume.java --- src/main/java/com/thealgorithms/maths/Volume.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/thealgorithms/maths/Volume.java b/src/main/java/com/thealgorithms/maths/Volume.java index 9fd29b49c6fc..0f282b2abae2 100644 --- a/src/main/java/com/thealgorithms/maths/Volume.java +++ b/src/main/java/com/thealgorithms/maths/Volume.java @@ -102,5 +102,4 @@ public static double volumePyramid(double baseArea, double height) { public static double volumeFrustumOfCone(double r1, double r2, double height) { return (Math.PI * height / 3) * (r1 * r1 + r2 * r2 + r1 * r2); } - }