From 6435b40f0024786654bbb9684d7dce4f4c2312dc Mon Sep 17 00:00:00 2001 From: trainee Date: Fri, 17 Mar 2017 10:45:20 +0700 Subject: [PATCH] Leonardus Dani Novianto - OOP Basic --- oop-basic/.gitignore | 1 + .../java/com/mitrais/cdc/java/Circle.java | 8 +++++++ .../com/mitrais/cdc/java/CircleOperation.java | 24 ++++++++++++++++--- .../java/com/mitrais/cdc/java/Rectangle.java | 9 +++++++ .../mitrais/cdc/java/RectangleOperation.java | 24 ++++++++++++++++--- .../java/com/mitrais/cdc/java/Square.java | 8 +++++++ .../com/mitrais/cdc/java/SquareOperation.java | 24 ++++++++++++++++--- 7 files changed, 89 insertions(+), 9 deletions(-) create mode 100644 oop-basic/.gitignore diff --git a/oop-basic/.gitignore b/oop-basic/.gitignore new file mode 100644 index 00000000..b83d2226 --- /dev/null +++ b/oop-basic/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/Circle.java b/oop-basic/src/main/java/com/mitrais/cdc/java/Circle.java index 61df57f4..dab387a5 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/Circle.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/Circle.java @@ -3,6 +3,14 @@ public class Circle { public double radius; + + public Circle(double radius){ + this.radius = radius; + } + + public double getArea(){ + return ((Math.PI)*radius*radius); + } /* * todo: make a Circle class with various capabilities below: diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/CircleOperation.java b/oop-basic/src/main/java/com/mitrais/cdc/java/CircleOperation.java index 0e805397..124e105a 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/CircleOperation.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/CircleOperation.java @@ -10,9 +10,13 @@ public void setRandomCircle(){ /*TO DO * create looping to stored random using Math.random */ + for(int i=0;ilargest) { + largest = circles[i].getArea(); + } + } } public double getLargest(){ - + setLargest(circles); return largest; } @@ -42,10 +57,13 @@ public void setSum(Circle[] circles){ /*TO DO * Create codes to get the sum area from circles array */ + for (int i = 0; i < circles.length; i++) { + sum += circles[i].getArea(); + } } public double getSum(){ - + setSum(circles); return sum; } } diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/Rectangle.java b/oop-basic/src/main/java/com/mitrais/cdc/java/Rectangle.java index 92e1b5e1..db13c912 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/Rectangle.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/Rectangle.java @@ -3,6 +3,15 @@ public class Rectangle { public double width, height; + + public Rectangle(double width, double height){ + this.width = width; + this.height = height; + } + + public double getArea(){ + return width * height; + } /* * todo: make a Square class with various capabilities below: diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/RectangleOperation.java b/oop-basic/src/main/java/com/mitrais/cdc/java/RectangleOperation.java index a3c5d006..16c22baf 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/RectangleOperation.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/RectangleOperation.java @@ -10,9 +10,13 @@ public void setRandomRectangle(){ /*TO DO * create looping to stored random using Math.random */ + for (int i = 0; i < rectangles.length; i++) { + rectangles[i] = new Rectangle(Math.random(),Math.random()); + } } public Rectangle[] getRandomRectangle(){ + setRandomRectangle(); return rectangles; } @@ -20,10 +24,16 @@ public void setSmallest(Rectangle[] rectangles){ /*TO DO * Create codes to get the smallest area from squares array */ + smallest = rectangles[0].getArea(); + for (int i = 1; i < rectangles.length; i++) { + if (rectangles[i].getArea()largest) { + largest = rectangles[i].getArea(); + } + } } public double getLargest(){ - + setLargest(rectangles); return largest; } @@ -42,10 +57,13 @@ public void setSum(Rectangle[] rectangles){ /*TO DO * Create codes to get the sum area from squares array */ + for (int i = 0; i < rectangles.length; i++) { + sum += rectangles[i].getArea(); + } } public double getSum(){ - + setSum(rectangles); return sum; } diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/Square.java b/oop-basic/src/main/java/com/mitrais/cdc/java/Square.java index 64577300..1b363d62 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/Square.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/Square.java @@ -3,6 +3,14 @@ public class Square { public double width; + + public Square(double width){ + this.width = width; + } + + public double getArea(){ + return width * width; + } /* * todo: make a Square class with various capabilities below: diff --git a/oop-basic/src/main/java/com/mitrais/cdc/java/SquareOperation.java b/oop-basic/src/main/java/com/mitrais/cdc/java/SquareOperation.java index c95a11a8..238c5ae2 100644 --- a/oop-basic/src/main/java/com/mitrais/cdc/java/SquareOperation.java +++ b/oop-basic/src/main/java/com/mitrais/cdc/java/SquareOperation.java @@ -10,9 +10,13 @@ public void setRandomSquare(){ /*TO DO * create looping to stored random using Math.random */ + for (int i = 0; i < squares.length; i++) { + squares[i] = new Square(Math.random()); + } } public Square[] getRandomSquare(){ + setRandomSquare(); return squares; } @@ -20,10 +24,16 @@ public void setSmallest(Square[] squares){ /*TO DO * Create codes to get the smallest area from squares array */ + smallest = squares[0].getArea(); + for (int i = 1; i < squares.length; i++) { + if (squares[i].getArea()largest) { + largest = squares[i].getArea(); + } + } } public double getLargest(){ - + setLargest(squares); return largest; } @@ -42,10 +57,13 @@ public void setSum(Square[] squares){ /*TO DO * Create codes to get the sum area from squares array */ + for (int i = 0; i < squares.length; i++) { + sum += squares[i].getArea(); + } } public double getSum(){ - + setSum(squares); return sum; } }