5
5
*/
6
6
public class Area {
7
7
public static void main (String [] args ) {
8
+
8
9
/* test cube */
9
- assert surfaceAreaCube (1 ) == 6 ;
10
+ assert Double . compare ( surfaceAreaCube (1 ), 6.0 ) == 0 ;
10
11
11
12
/* test sphere */
12
- assert surfaceAreaSphere (5 ) == 314.1592653589793 ;
13
- assert surfaceAreaSphere (1 ) == 12.566370614359172 ;
13
+ assert Double . compare ( surfaceAreaSphere (5 ), 314.1592653589793 ) == 0 ;
14
+ assert Double . compare ( surfaceAreaSphere (1 ), 12.566370614359172 ) == 0 ;
14
15
15
16
/* test rectangle */
16
- assert surfaceAreaRectangle (10 , 20 ) == 200 ;
17
+ assert Double . compare ( surfaceAreaRectangle (10 , 20 ), 200.0 ) == 0 ;
17
18
18
19
/* test square */
19
- assert surfaceAreaSquare (10 ) == 100 ;
20
+ assert Double . compare ( surfaceAreaSquare (10 ), 100.0 ) == 0 ;
20
21
21
22
/* test triangle */
22
- assert surfaceAreaTriangle (10 , 10 ) == 50 ;
23
+ assert Double . compare ( surfaceAreaTriangle (10 , 10 ), 50.0 ) == 0 ;
23
24
24
25
/* test parallelogram */
25
- assert surfaceAreaParallelogram (10 , 20 ) == 200 ;
26
+ assert Double . compare ( surfaceAreaParallelogram (10 , 20 ), 200.0 ) == 0 ;
26
27
27
28
/* test trapezium */
28
- assert surfaceAreaTrapezium (10 , 20 , 30 ) == 450 ;
29
+ assert Double . compare ( surfaceAreaTrapezium (10 , 20 , 30 ), 450.0 ) == 0 ;
29
30
30
31
/* test circle */
31
- assert surfaceAreaCircle (20 ) == 1256.6370614359173 ;
32
-
32
+ assert Double .compare (surfaceAreaCircle (20 ), 1256.6370614359173 ) == 0 ;
33
33
}
34
34
35
35
/**
@@ -38,7 +38,7 @@ public static void main(String[] args) {
38
38
* @param sideLength side length of cube
39
39
* @return surface area of given cube
40
40
*/
41
- public static double surfaceAreaCube (double sideLength ) {
41
+ private static double surfaceAreaCube (double sideLength ) {
42
42
return 6 * sideLength * sideLength ;
43
43
}
44
44
@@ -48,7 +48,7 @@ public static double surfaceAreaCube(double sideLength) {
48
48
* @param radius radius of sphere
49
49
* @return surface area of given sphere
50
50
*/
51
- public static double surfaceAreaSphere (double radius ) {
51
+ private static double surfaceAreaSphere (double radius ) {
52
52
return 4 * Math .PI * radius * radius ;
53
53
}
54
54
@@ -59,7 +59,7 @@ public static double surfaceAreaSphere(double radius) {
59
59
* @param width width of rectangle
60
60
* @return area of given rectangle
61
61
*/
62
- public static double surfaceAreaRectangle (double length , double width ) {
62
+ private static double surfaceAreaRectangle (double length , double width ) {
63
63
return length * width ;
64
64
}
65
65
@@ -69,7 +69,7 @@ public static double surfaceAreaRectangle(double length, double width) {
69
69
* @param sideLength side length of square
70
70
* @return area of given square
71
71
*/
72
- public static double surfaceAreaSquare (double sideLength ) {
72
+ private static double surfaceAreaSquare (double sideLength ) {
73
73
return sideLength * sideLength ;
74
74
}
75
75
@@ -80,7 +80,7 @@ public static double surfaceAreaSquare(double sideLength) {
80
80
* @param height height of triangle
81
81
* @return area of given triangle
82
82
*/
83
- public static double surfaceAreaTriangle (double base , double height ) {
83
+ private static double surfaceAreaTriangle (double base , double height ) {
84
84
return base * height / 2 ;
85
85
}
86
86
@@ -91,7 +91,7 @@ public static double surfaceAreaTriangle(double base, double height) {
91
91
* @param height height of parallelogram
92
92
* @return area of given parallelogram
93
93
*/
94
- public static double surfaceAreaParallelogram (double base , double height ) {
94
+ private static double surfaceAreaParallelogram (double base , double height ) {
95
95
return base * height ;
96
96
}
97
97
@@ -103,7 +103,7 @@ public static double surfaceAreaParallelogram(double base, double height) {
103
103
* @param height height of trapezium
104
104
* @return area of given trapezium
105
105
*/
106
- public static double surfaceAreaTrapezium (double base1 , double base2 , double height ) {
106
+ private static double surfaceAreaTrapezium (double base1 , double base2 , double height ) {
107
107
return (base1 + base2 ) * height / 2 ;
108
108
}
109
109
@@ -113,7 +113,7 @@ public static double surfaceAreaTrapezium(double base1, double base2, double hei
113
113
* @param radius radius of circle
114
114
* @return area of given circle
115
115
*/
116
- public static double surfaceAreaCircle (double radius ) {
116
+ private static double surfaceAreaCircle (double radius ) {
117
117
return Math .PI * radius * radius ;
118
118
}
119
- }
119
+ }
0 commit comments