From 1864d5f739743b0558499a2943f0544bc4fb83bb Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Sun, 17 Apr 2022 12:06:54 -0500 Subject: [PATCH 1/8] Area of a triangle using side lengths --- .../thealgorithms/maths/HeronsFormula.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/main/java/com/thealgorithms/maths/HeronsFormula.java diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java new file mode 100644 index 000000000000..0ed2b5e25f8c --- /dev/null +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -0,0 +1,27 @@ +package com.thealgorithms.maths; + +/** + * Find the area of a triangle using only side lengths + */ + +public class HeronsFormula { + + public static void main(String[] args) + { + assert Herons(3,4,5) == 6.0; + assert Herons(24,30,18) == 216.0; + assert Herons(1,1,1) == 0.4330127018922193; + assert Herons(4,5,8) == 8.181534085976786; + } + + public static double Herons(int s1, int s2, int s3) + { + double a = s1; + double b = s2; + double c = s3; + double s = (a + b + c)/2.0; + double area = 0; + area = Math.sqrt((s)*(s-a)*(s-b)*(s-c)); + return area; + } +} From 8ea020acd00250e050e1084b4a6a5169f98e9fc3 Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:03:37 -0500 Subject: [PATCH 2/8] Added automated tests to main() --- .../thealgorithms/maths/HeronsFormula.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java index 0ed2b5e25f8c..74a3e6d74472 100644 --- a/src/main/java/com/thealgorithms/maths/HeronsFormula.java +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -1,19 +1,15 @@ package com.thealgorithms.maths; +import static org.junit.jupiter.api.Assertions.assertAll; +import static org.junit.jupiter.api.Assertions.assertEquals; +import org.junit.jupiter.api.Test; + /** + * * Find the area of a triangle using only side lengths + * */ - public class HeronsFormula { - - public static void main(String[] args) - { - assert Herons(3,4,5) == 6.0; - assert Herons(24,30,18) == 216.0; - assert Herons(1,1,1) == 0.4330127018922193; - assert Herons(4,5,8) == 8.181534085976786; - } - public static double Herons(int s1, int s2, int s3) { double a = s1; @@ -24,4 +20,13 @@ public static double Herons(int s1, int s2, int s3) area = Math.sqrt((s)*(s-a)*(s-b)*(s-c)); return area; } + @Test + public static void main(String[] args) + { + assertAll("triangles", + () -> assertEquals(Herons(3,4,5), 6.0), + () -> assertEquals(Herons(24,30,18), 216.0), + () -> assertEquals(Herons(1,1,1), 0.4330127018922193), + () -> assertEquals(Herons(4,5,8), 8.181534085976786)); + } } From 4ce6b8b3d4822af724657b0fb5e1e3f4f24cbf9a Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:12:07 -0500 Subject: [PATCH 3/8] Fixed errors --- src/main/java/com/thealgorithms/maths/HeronsFormula.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java index 74a3e6d74472..a014f539a939 100644 --- a/src/main/java/com/thealgorithms/maths/HeronsFormula.java +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -1,7 +1,6 @@ package com.thealgorithms.maths; -import static org.junit.jupiter.api.Assertions.assertAll; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; /** From edfe53ee3d53ba8774d9526ceb8a20a89ffb29fa Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:20:36 -0500 Subject: [PATCH 4/8] Changed main() to testAssertions() --- src/main/java/com/thealgorithms/maths/HeronsFormula.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java index a014f539a939..993728b5cb37 100644 --- a/src/main/java/com/thealgorithms/maths/HeronsFormula.java +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -20,7 +20,7 @@ public static double Herons(int s1, int s2, int s3) return area; } @Test - public static void main(String[] args) + void testAssertions() { assertAll("triangles", () -> assertEquals(Herons(3,4,5), 6.0), From e7d612762d91bcd12e7d6713f4b4713490fd9729 Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Tue, 19 Apr 2022 20:29:01 -0500 Subject: [PATCH 5/8] Changed testing method to match similar algorithms in repository --- .../thealgorithms/maths/HeronsFormula.java | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java index 993728b5cb37..57e0ce11df8f 100644 --- a/src/main/java/com/thealgorithms/maths/HeronsFormula.java +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -1,14 +1,19 @@ package com.thealgorithms.maths; -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; - /** - * * Find the area of a triangle using only side lengths - * */ + public class HeronsFormula { + + public static void main(String[] args) + { + assert Double.compare(Herons(3,4,5), 6.0) == 0; + assert Double.compare(Herons(24,30,18), 216.0) == 0;; + assert Double.compare(Herons(1,1,1), 0.4330127018922193) == 0; + assert Double.compare(Herons(4,5,8), 8.181534085976786) == 0; + } + public static double Herons(int s1, int s2, int s3) { double a = s1; @@ -19,13 +24,4 @@ public static double Herons(int s1, int s2, int s3) area = Math.sqrt((s)*(s-a)*(s-b)*(s-c)); return area; } - @Test - void testAssertions() - { - assertAll("triangles", - () -> assertEquals(Herons(3,4,5), 6.0), - () -> assertEquals(Herons(24,30,18), 216.0), - () -> assertEquals(Herons(1,1,1), 0.4330127018922193), - () -> assertEquals(Herons(4,5,8), 8.181534085976786)); - } } From b277cd658d3358327402484d25a39e07478fd3e9 Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Mon, 25 Apr 2022 19:32:45 -0500 Subject: [PATCH 6/8] Update HeronsFormula.java --- .../java/com/thealgorithms/maths/HeronsFormula.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/main/java/com/thealgorithms/maths/HeronsFormula.java b/src/main/java/com/thealgorithms/maths/HeronsFormula.java index 57e0ce11df8f..b3da87017829 100644 --- a/src/main/java/com/thealgorithms/maths/HeronsFormula.java +++ b/src/main/java/com/thealgorithms/maths/HeronsFormula.java @@ -5,15 +5,7 @@ */ public class HeronsFormula { - - public static void main(String[] args) - { - assert Double.compare(Herons(3,4,5), 6.0) == 0; - assert Double.compare(Herons(24,30,18), 216.0) == 0;; - assert Double.compare(Herons(1,1,1), 0.4330127018922193) == 0; - assert Double.compare(Herons(4,5,8), 8.181534085976786) == 0; - } - + public static double Herons(int s1, int s2, int s3) { double a = s1; From d7114ece2b2ba049bc4f6f584cef30c5defb15ec Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Mon, 25 Apr 2022 19:46:52 -0500 Subject: [PATCH 7/8] Added test for Heron's Formula --- .../maths/HeronsFormulaTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java diff --git a/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java b/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java new file mode 100644 index 000000000000..7cbfaa5dd52b --- /dev/null +++ b/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java @@ -0,0 +1,27 @@ +package com.thealgorithms.maths; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class HeronsFormulaTest { + @Test + void test1() + { + Assertions.assertEquals(Herons(3,4,5), 6.0); + } + @Test + void test2() + { + Assertions.assertEquals(Herons(24,30,18), 216.0); + } + @Test + void test3() + { + Assertions.assertEquals(Herons(1,1,1), 0.4330127018922193); + } + @Test + void test4() + { + Assertions.assertEquals(Herons(4,5,8), 8.181534085976786); + } +} From 5d6880c6fbc72a3074767b80b5f584f669e14caa Mon Sep 17 00:00:00 2001 From: RaghavTaneja <97575679+RaghavTaneja@users.noreply.github.com> Date: Mon, 25 Apr 2022 19:56:33 -0500 Subject: [PATCH 8/8] Fixed test class --- .../java/com/thealgorithms/maths/HeronsFormulaTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java b/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java index 7cbfaa5dd52b..44328399f8b9 100644 --- a/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java +++ b/src/test/java/com/thealgorithms/maths/HeronsFormulaTest.java @@ -7,21 +7,21 @@ public class HeronsFormulaTest { @Test void test1() { - Assertions.assertEquals(Herons(3,4,5), 6.0); + Assertions.assertEquals(HeronsFormula.Herons(3,4,5), 6.0); } @Test void test2() { - Assertions.assertEquals(Herons(24,30,18), 216.0); + Assertions.assertEquals(HeronsFormula.Herons(24,30,18), 216.0); } @Test void test3() { - Assertions.assertEquals(Herons(1,1,1), 0.4330127018922193); + Assertions.assertEquals(HeronsFormula.Herons(1,1,1), 0.4330127018922193); } @Test void test4() { - Assertions.assertEquals(Herons(4,5,8), 8.181534085976786); + Assertions.assertEquals(HeronsFormula.Herons(4,5,8), 8.181534085976786); } }