Random moves sometimes and doc

src/com/rthoni/uqac/pigeon/Game.java

@@ -2,29 +2,28 @@ package com.rthoni.uqac.pigeon;
 
 import javax.swing.*;
 import javax.swing.Timer;
-import javax.swing.event.MouseInputListener;
 import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.MouseEvent;
-import java.awt.event.MouseListener;
+import java.awt.event.*;
 import java.util.*;
 import java.util.List;
 
 /**
  * Created by ZHAJOR on 30/10/2016.
  */
-public class Game extends JPanel implements MouseListener, ActionListener{
+public class Game extends JPanel implements MouseListener, ActionListener
+{
 
-    private int x, y;
     private List<Pigeon> pigeons;
     private List<Food> foods;
 
-    public Game(){
+    /**
+     * Initialize the game and create some pigeons
+     */
+    public Game(int nb){
         addMouseListener(this);
         this.pigeons = new ArrayList<Pigeon>();
         this.foods = new ArrayList<Food>();
-        for(int i = 0; i < 10; ++i){
+        for(int i = 0; i < nb; ++i){
             Pigeon p = new Pigeon(""+i, this);
             this.pigeons.add(p);
             p.start();
@@ -33,6 +32,10 @@ public class Game extends JPanel implements MouseListener, ActionListener{
         this.setDoubleBuffered(false);
     }
 
+    /**
+     * Paint the scene
+     * @param g The graphics
+     */
     @Override
     public void paint(Graphics g) {
         Graphics2D g2d = (Graphics2D) g;
@@ -41,7 +44,7 @@ public class Game extends JPanel implements MouseListener, ActionListener{
         for (Pigeon pigeon : this.pigeons) {
             g2d.fillOval(pigeon.getX(), pigeon.getY(), 30, 30);
         }
-        //g2d.setColor(Color.BLUE);
+        g2d.setColor(Color.BLUE);
         // Draw foods
         for (Food food : this.foods) {
             g2d.fillRect(food.getX(), food.getY(), 15, 15);
@@ -56,8 +59,6 @@ public class Game extends JPanel implements MouseListener, ActionListener{
     @Override
     public void mousePressed(MouseEvent e) {
         this.foods.add(new Food(e.getX(), e.getY()));
-        System.out.print(e.getX() + " ");
-        System.out.print(e.getY() + "\n");
     }
 
     @Override

src/com/rthoni/uqac/pigeon/Main.java

@@ -16,11 +16,8 @@ public class Main {
         frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
         frame.setSize(800, 800);
         frame.setResizable(false);
-        //frame.pack();
         frame.setVisible(true);
-
-        Game g = new Game();
-        frame.add(g);
+        frame.add(new Game(10));
     }
 
     public static void main(String... argv)

src/com/rthoni/uqac/pigeon/Pigeon.java

@@ -14,6 +14,11 @@ public class Pigeon implements Runnable{
     private final Game game;
     private static final int speed = 10;
 
+    /**
+     * Create a new pigeon with a random position
+     * @param name The pigeon name
+     * @param g The pigeon world
+     */
     public Pigeon(String name, Game g) {
         Random r = new Random();
         x = r.nextInt(700);
@@ -22,29 +27,28 @@ public class Pigeon implements Runnable{
         this.game = g;
     }
 
+    /**
+     * The piegon behavior during his life
+     */
     @Override
     public void run() {
         while (true) {
             synchronized (game) {
+                // Get the food near the pigeon
                 List<Food> foods = game.getFoods();
                 Food best = new Food();
-                int bestFoodX = 0, bestFoodY = 0, distance = -1, bestIndex = -1, index = 0;
+                int distance = -1;
                 for (Food food : foods) {
                     if (distance == -1) {
                         distance = computeDistance(food.getX(), food.getY());
-                        bestFoodX = food.getX();
-                        bestFoodY = food.getY();
-                        bestIndex = index;
                         best = food;
                     } else if (distance > computeDistance(food.getX(), food.getY())) {
                         distance = computeDistance(food.getX(), food.getY());
-                        bestFoodX = food.getX();
-                        bestFoodY = food.getY();
-                        bestIndex = index;
+
                         best = food;
                     }
-                    index++;
                 }
+                // Eat or move if there is a food
                 if (distance != -1 && distance <= Pigeon.speed) {
                     this.x = best.getX();
                     this.y = best.getY();
@@ -55,15 +59,25 @@ public class Pigeon implements Runnable{
                 else if (distance != -1){
                     this.computeNewPosition(best.getX(), best.getY());
                 }
+                // Random move
+                else {
+                    Random r = new Random();
+                    if (r.nextInt(100) > 90 + r.nextInt(8)) {
+                        int moveX = r.nextInt(100) -50;
+                        int moveY = r.nextInt(100) -50;
+                        this.x += moveX;
+                        this.y += moveY;
+                        if (this.x > game.getWidth())
+                            this.x = game.getWidth() - r.nextInt(30);
+                        else if (this.x < 0)
+                            this.x = r.nextInt(30);
+                        if (this.y > game.getHeight())
+                            this.y = game.getHeight() - r.nextInt(30);
+                        else if (this.y < 0)
+                            this.y = r.nextInt(30);
+                    }
+                }
             }
-
-
-//            Random r = new Random();
-//            int moveX = r.nextInt(10);
-//            int moveY = r.nextInt(10);
-//            this.x += moveX;
-//            this.y += moveY;
-
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {
@@ -72,12 +86,23 @@ public class Pigeon implements Runnable{
         }
     }
 
+    /**
+     * Compute the distance between the pigeon and the food
+     * @param x the x position of the food
+     * @param y the y position of the food
+     * @return the distance
+     */
     private int computeDistance(int x, int y) {
         int diffx = this.x > x ? this.x - x : x - this.x;
         int diffy = this.y > y ? this.y - y : y - this.y;
         return diffx + diffy;
     }
 
+    /**
+     * Move the pigeon
+     * @param x the x position of the food
+     * @param y the y position of the food
+     */
     private void computeNewPosition(int x, int y) {
         int moves = Pigeon.speed;
         while (moves > 0 ) {
@@ -100,8 +125,11 @@ public class Pigeon implements Runnable{
         }
     }
 
+    /**
+     * Start the thread
+     */
     public void start () {
-        System.out.println("Starting " +  name );
+        System.out.println("New pigeon alive : " +  name );
         if (t == null) {
             t = new Thread (this, name);
             t.start ();