17 files changed, 674 insertions, 729 deletions

diff --git a/src/ch/epfl/maze/physical/Animal.java b/src/ch/epfl/maze/physical/Animal.java
index 8749f61..ebe389f 100644
--- a/src/ch/epfl/maze/physical/Animal.java
+++ b/src/ch/epfl/maze/physical/Animal.java
@@ -6,72 +6,68 @@ import ch.epfl.maze.util.Vector2D;
 /**
  * Animal inside a {@code World} that can move depending on the available
  * choices it has at its position.
- * 
  */
 
 abstract public class Animal {
 
-        /**
-         * Constructs an animal with a specified position.
-         * 
-         * @param position
-         *            Position of the animal in the labyrinth
-         */
+    /**
+     * Constructs an animal with a specified position.
+     *
+     * @param position Position of the animal in the labyrinth
+     */
 
-        public Animal(Vector2D position) {
-                // TODO
-        }
+    public Animal(Vector2D position) {
+        // TODO
+    }
 
-        /**
-         * Retrieves the next direction of the animal, by selecting one choice among
-         * the ones available from its position.
-         * 
-         * @param choices
-         *            The choices left to the animal at its current position (see
-         *            {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
-         *            World.getChoices(Vector2D)})
-         * @return The next direction of the animal, chosen in {@code choices}
-         */
+    /**
+     * Retrieves the next direction of the animal, by selecting one choice among
+     * the ones available from its position.
+     *
+     * @param choices The choices left to the animal at its current position (see
+     *                {@link ch.epfl.maze.physical.World#getChoices(Vector2D)
+     *                World.getChoices(Vector2D)})
+     * @return The next direction of the animal, chosen in {@code choices}
+     */
 
-        abstract public Direction move(Direction[] choices);
+    abstract public Direction move(Direction[] choices);
 
-        /**
-         * Updates the animal position with a direction.
-         * <p>
-         * <b>Note</b> : Do not call this function in {@code move(Direction[]
-         * choices)} !
-         * 
-         * @param dir
-         *            Direction that the animal has taken
-         */
+    /**
+     * Updates the animal position with a direction.
+     * <p>
+     * <b>Note</b> : Do not call this function in {@code move(Direction[]
+     * choices)} !
+     *
+     * @param dir Direction that the animal has taken
+     */
 
-        public final void update(Direction dir) {
-                // TODO
-        }
+    public final void update(Direction dir) {
+        // TODO
+    }
 
-        /**
-         * Sets new position for Animal.
-         * <p>
-         * <b>Note</b> : Do not call this function in {@code move(Direction[]
-         * choices)} !
-         * 
-         * @param position
-         */
+    /**
+     * Sets new position for Animal.
+     * <p>
+     * <b>Note</b> : Do not call this function in {@code move(Direction[]
+     * choices)} !
+     *
+     * @param position
+     */
 
-        public final void setPosition(Vector2D position) {
-                // TODO
-        }
+    public final void setPosition(Vector2D position) {
+        // TODO
+    }
 
-        /**
-         * Returns position vector of animal.
-         * 
-         * @return Current position of animal.
-         */
+    /**
+     * Returns position vector of animal.
+     *
+     * @return Current position of animal.
+     */
 
-        public final Vector2D getPosition() {
-                // TODO
-                return null;
-        }
+    public final Vector2D getPosition() {
+        // TODO
+        return null;
+    }
 
-        abstract public Animal copy();
+    abstract public Animal copy();
 }
diff --git a/src/ch/epfl/maze/physical/Daedalus.java b/src/ch/epfl/maze/physical/Daedalus.java
index 329ab92..2edad7b 100644
--- a/src/ch/epfl/maze/physical/Daedalus.java
+++ b/src/ch/epfl/maze/physical/Daedalus.java
@@ -6,131 +6,123 @@ import java.util.List;
 /**
  * Daedalus in which predators hunt preys. Once a prey has been caught by a
  * predator, it will be removed from the daedalus.
- * 
  */
 
 public final class Daedalus extends World {
 
-        /**
-         * Constructs a Daedalus with a labyrinth structure
-         * 
-         * @param labyrinth
-         *            Structure of the labyrinth, an NxM array of tiles
-         */
-
-        public Daedalus(int[][] labyrinth) {
-                super(labyrinth);
-                // TODO
-        }
-
-        @Override
-        public boolean isSolved() {
-                // TODO
-                return false;
-        }
-
-        /**
-         * Adds a predator to the daedalus.
-         * 
-         * @param p
-         *            The predator to add
-         */
-
-        public void addPredator(Predator p) {
-                // TODO
-        }
-
-        /**
-         * Adds a prey to the daedalus.
-         * 
-         * @param p
-         *            The prey to add
-         */
-
-        public void addPrey(Prey p) {
-                // TODO
-        }
-
-        /**
-         * Removes a predator from the daedalus.
-         * 
-         * @param p
-         *            The predator to remove
-         */
-
-        public void removePredator(Predator p) {
-                // TODO
-        }
-
+    /**
+     * Constructs a Daedalus with a labyrinth structure
+     *
+     * @param labyrinth Structure of the labyrinth, an NxM array of tiles
+     */
+
+    public Daedalus(int[][] labyrinth) {
+        super(labyrinth);
+        // TODO
+    }
+
+    @Override
+    public boolean isSolved() {
+        // TODO
+        return false;
+    }
+
+    /**
+     * Adds a predator to the daedalus.
+     *
+     * @param p The predator to add
+     */
+
+    public void addPredator(Predator p) {
+        // TODO
+    }
+
+    /**
+     * Adds a prey to the daedalus.
+     *
+     * @param p The prey to add
+     */
+
+    public void addPrey(Prey p) {
+        // TODO
+    }
+
+    /**
+     * Removes a predator from the daedalus.
+     *
+     * @param p The predator to remove
+     */
+
+    public void removePredator(Predator p) {
+        // TODO
+    }
+
+    /**
+     * Removes a prey from the daedalus.
+     *
+     * @param p The prey to remove