Add some task

java-tester-x · java-tester-x · commit 0e646fc0e9ea · 2014-06-12T20:48:39.000+03:00
diff --git a/src/Book.java b/src/Book.java
@@ -55,7 +55,19 @@ public void setQtyInStock(int qtyInStock) {
       this.qtyInStock = qtyInStock;
    }
 
+   public String getAuthorName() {
+      return this.author.getName();
+   }
+
+   public String getAuthorEmail() {
+      return this.author.getEmail();
+   }
+
+   public char getAuthorGender() {
+      return this.author.getGender();
+   }
+   
    public String toString() {
       return "'" + name +"' by " + author;
-   }
+   }   
 }
diff --git a/src/MyCircle.java b/src/MyCircle.java
@@ -0,0 +1,53 @@
+package src;
+
+public class MyCircle {
+
+    private MyPoint center;
+    private int radius = 1;
+
+    public MyCircle(int x, int y, int radius) {
+        this.center = new MyPoint(x, y);
+        this.radius = radius;
+    }
+
+    public MyCircle(MyPoint center, int radius) {
+        this.center = center;
+        this.radius = radius;
+    }
+
+    public int getRadius() {
+        return this.radius;
+    }
+
+    public void setRadius(int radius) {
+        this.radius = radius;
+    }
+
+    public MyPoint getCenter() {
+        return this.center;
+    }
+
+    public void setCenter(MyPoint center) {
+        this.center = center;
+    }
+
+    public int getCenterX() {
+        return this.center.getX();
+    }
+
+    public int getCenterY() {
+        return this.center.getY();
+    }
+
+    public void setCenterXY(int x, int y) {
+        this.center.setXY(x, y);
+    }
+
+    public double getArea() {
+        return Math.PI * radius * radius;
+    }
+
+    public String toString() {
+        return "Circle @ "+this.center+" radius="+this.radius;
+    }
+}   
diff --git a/src/MyPoint.java b/src/MyPoint.java
@@ -0,0 +1,52 @@
+package src;
+
+public class MyPoint {
+
+    private int x = 0;
+    private int y = 0;
+
+    public MyPoint() {}
+
+    public MyPoint(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public int getX() {
+        return this.x;
+    }
+
+    public void setX(int x) {
+        this.x = x;
+    }
+
+    public int getY() {
+        return this.y;
+    }
+
+    public void setY(int y) {
+        this.y = y;
+    }
+
+    public void setXY(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public double distance(int x, int y) {
+        int xDiff = this.x - x;
+        int yDiff = this.y - y;
+        return Math.sqrt(xDiff*xDiff + yDiff*yDiff);
+    }
+
+    public double distance(MyPoint another) {
+        int xDiff = this.x - another.getX();
+        int yDiff = this.y - another.getY();
+        return Math.sqrt(xDiff*xDiff + yDiff*yDiff);
+    }
+
+    public String toString() {
+        return "(" + this.x + ", " + this.y + ")";
+    }
+
+}   
diff --git a/src/TestBook.java b/src/TestBook.java
@@ -12,5 +12,14 @@ public static void main(String[] args)
             "more Java for dummy"
             , new Author("Bruce Eckel", "b.eckel@somewhere.com", 'm')
             , 29.95, 888);
+
+        // additional task #1
+        System.out.println("Java for dummy author name is: " + aBook.getAuthor().getName());
+        System.out.println("Java for dummy author email is: " + aBook.getAuthor().getEmail());
+
+        // additional task #2
+        System.out.println("Java for dummy author name is: " + aBook.getAuthorName());
+        System.out.println("Java for dummy author email is: " + aBook.getAuthorEmail());
+        System.out.println("Java for dummy author gender is: " + aBook.getAuthorGender());
     }
 }   
diff --git a/src/TestMyCircle.java b/src/TestMyCircle.java
@@ -0,0 +1,26 @@
+package src;
+
+public class TestMyCircle {
+
+    public static void main(String[] args)
+    {
+        MyCircle c1 = new MyCircle(3, 0, 3);
+        MyCircle c2 = new MyCircle(new MyPoint(1,1), 5);
+
+        System.out.println("Circle c1: "+ c1);
+        System.out.println("Circle c2: "+ c2);
+
+        c1.setRadius(5);
+        System.out.println("Radius of circle c1 now is "+ c1.getRadius());
+
+        c2.setCenterXY(3, 3);
+        System.out.println("Center of circle c2 now is "+ c2.getCenter());
+
+        c1.setCenter(new MyPoint(4,4));
+        System.out.println("Center of circle c1 now is "+ c1.getCenter());
+
+        
+        System.out.println("Area of circle c1 is "+ c1.getArea());
+        System.out.println("Area of circle c2 is "+ c2.getArea());
+    }
+}   
diff --git a/src/TestMyPoint.java b/src/TestMyPoint.java
@@ -0,0 +1,25 @@
+package src;
+
+public class TestMyPoint {
+
+    public static void main(String[] args)
+    {
+        // additional task #1
+        MyPoint p1 = new MyPoint(3, 0);
+        MyPoint p2 = new MyPoint(0, 4);
+
+        // Testing the overloaded method distance()
+        System.out.println(p1.distance(p2));    // which version?
+        System.out.println(p1.distance(5, 6));  // which version?
+
+        // additional task #2
+        MyPoint[] points = new MyPoint[10];
+        for (int i= 0; i < points.length; i++ ) {
+            points[i] = new MyPoint((i+1), (i+1));
+        }
+
+        for (MyPoint p : points) {
+            System.out.println("Distance between p1"+ p1 +" and p"+ p +" is "+ p1.distance(p));
+        }
+    }
+}   
