7 files changed, 978 insertions, 1015 deletions

diff --git a/src/ch/epfl/maze/tests/AnimalTest.java b/src/ch/epfl/maze/tests/AnimalTest.java
index c4c9220..4a590ae 100644
--- a/src/ch/epfl/maze/tests/AnimalTest.java
+++ b/src/ch/epfl/maze/tests/AnimalTest.java
@@ -1,100 +1,95 @@
 package ch.epfl.maze.tests;
 
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
 import ch.epfl.maze.physical.Animal;
 import ch.epfl.maze.util.Direction;
 import ch.epfl.maze.util.Vector2D;
+import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Test case for {@code Animal} implementation.
- * 
  */
 
 public class AnimalTest extends TestCase {
 
-        /**
-         * Test case for {@code getPosition()}.
-         */
-
-        @Test
-        public void testGetPosition() {
-                Animal animal = new MockAnimal(new Vector2D(2, 1));
-
-                // checks getPosition()
-                assertEquals(new Vector2D(2, 1), animal.getPosition());
-        }
-
-        /**
-         * Test case for {@code setPosition(Vector2D position)}.
-         */
-
-        @Test
-        public void testSetPosition() {
-                Animal animal = new MockAnimal(new Vector2D(2, 1));
-
-                // checks setPosition(Vector2D position)
-                animal.setPosition(new Vector2D(3, 5));
-                assertEquals(new Vector2D(3, 5), animal.getPosition());
-        }
-
-        /**
-         * Test case for {@code update(Direction dir)}.
-         */
-
-        @Test
-        public void testUpdate() {
-                Animal animal = new MockAnimal(new Vector2D(2, 1));
-
-                // checks update(Direction dir) with NONE
-                animal.update(Direction.NONE);
-                assertEquals(new Vector2D(2, 1), animal.getPosition());
-
-                // checks update(Direction dir) with DOWN
-                animal.update(Direction.DOWN);
-                assertEquals(new Vector2D(2, 2), animal.getPosition());
-
-                // checks update(Direction dir) with UP
-                animal.update(Direction.UP);
-                assertEquals(new Vector2D(2, 1), animal.getPosition());
-
-                // checks update(Direction dir) with RIGHT
-                animal.update(Direction.RIGHT);
-                assertEquals(new Vector2D(3, 1), animal.getPosition());
-
-                // checks update(Direction dir) with LEFT
-                animal.update(Direction.LEFT);
-                assertEquals(new Vector2D(2, 1), animal.getPosition());
-        }
-
-        /**
-         * Mock class that makes {@code Animal} concrete.
-         * 
-         */
-
-        private class MockAnimal extends Animal {
-
-                /**
-                 * Creates a concrete instance of the {@code Animal} class.
-                 * 
-                 * @param labyrinth
-                 *            Actual maze
-                 */
-
-                public MockAnimal(Vector2D position) {
-                        super(position);
-                }
-
-                @Override
-                public Direction move(Direction[] choices) {
-                        return null;
-                }
-
-                @Override
-                public Animal copy() {
-                        return null;
-                }
-        }
+    /**
+     * Test case for {@code getPosition()}.
+     */
+
+    @Test
+    public void testGetPosition() {
+        Animal animal = new MockAnimal(new Vector2D(2, 1));
+
+        // checks getPosition()
+        assertEquals(new Vector2D(2, 1), animal.getPosition());
+    }
+
+    /**
+     * Test case for {@code setPosition(Vector2D position)}.
+     */
+
+    @Test
+    public void testSetPosition() {
+        Animal animal = new MockAnimal(new Vector2D(2, 1));
+
+        // checks setPosition(Vector2D position)
+        animal.setPosition(new Vector2D(3, 5));
+        assertEquals(new Vector2D(3, 5), animal.getPosition());
+    }
+
+    /**
+     * Test case for {@code update(Direction dir)}.
+     */
+
+    @Test
+    public void testUpdate() {
+        Animal animal = new MockAnimal(new Vector2D(2, 1));
+
+        // checks update(Direction dir) with NONE
+        animal.update(Direction.NONE);
+        assertEquals(new Vector2D(2, 1), animal.getPosition());
+
+        // checks update(Direction dir) with DOWN
+        animal.update(Direction.DOWN);
+        assertEquals(new Vector2D(2, 2), animal.getPosition());
+
+        // checks update(Direction dir) with UP
+        animal.update(Direction.UP);
+        assertEquals(new Vector2D(2, 1), animal.getPosition());
+
+        // checks update(Direction dir) with RIGHT
+        animal.update(Direction.RIGHT);
+        assertEquals(new Vector2D(3, 1), animal.getPosition());
+
+        // checks update(Direction dir) with LEFT
+        animal.update(Direction.LEFT);
+        assertEquals(new Vector2D(2, 1), animal.getPosition());
+    }
+
+    /**
+     * Mock class that makes {@code Animal} concrete.
+     */
+
+    private class MockAnimal extends Animal {
+
+        /**
+         * Creates a concrete instance of the {@code Animal} class.
+         *
+         * @param labyrinth Actual maze
+         */
+
+        public MockAnimal(Vector2D position) {
+            super(position);
+        }
+
+        @Override
+        public Direction move(Direction[] choices) {
+            return null;
+        }
+
+        @Override
+        public Animal copy() {
+            return null;
+        }
+    }
 }
diff --git a/src/ch/epfl/maze/tests/Competition.java b/src/ch/epfl/maze/tests/Competition.java
index 4ed42b6..ccbbe73 100644
--- a/src/ch/epfl/maze/tests/Competition.java
+++ b/src/ch/epfl/maze/tests/Competition.java
@@ -1,25 +1,19 @@
 package ch.epfl.maze.tests;
 
-import static org.junit.Assert.assertTrue;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import ch.epfl.maze.physical.Animal;
 import ch.epfl.maze.physical.Maze;
-import ch.epfl.maze.physical.zoo.Bear;
-import ch.epfl.maze.physical.zoo.Hamster;
-import ch.epfl.maze.physical.zoo.Monkey;
-import ch.epfl.maze.physical.zoo.Mouse;
-import ch.epfl.maze.physical.zoo.Panda;
-import ch.epfl.maze.physical.zoo.SpaceInvader;
+import ch.epfl.maze.physical.zoo.*;
 import ch.epfl.maze.simulation.MazeSimulation;
 import ch.epfl.maze.simulation.Simulation;
 import ch.epfl.maze.util.LabyrinthGenerator;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.junit.Assert.assertTrue;
 
 /**
  * Competition of the {@code SpaceInvader} against the other animals.
@@ -36,128 +30,127 @@ import ch.epfl.maze.util.LabyrinthGenerator;
  * winner against one animal if it obtained a positive score in the rivalry
  * against it.</li>
  * </ul>
- *
  */
 
 public class Competition {
 
-        static final String COMPETITION_MAZE_FILE = "labyrinth.txt";
-        static final int NUMBER_OF_ROUNDS = 1000;
-        static HashMap<String, Integer> rivalries;
-
-        /**
-         * Launches the competition between the {@code SpaceInvader} and the other
+    static final String COMPETITION_MAZE_FILE = "labyrinth.txt";
+    static final int NUMBER_OF_ROUNDS = 1000;
+    static HashMap<String, Integer> rivalries;
+
+    /**
+     * Launches the competition between the {@code SpaceInvader} and the other