Reformat imported code

1 files changed, 128 insertions, 135 deletions

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
-         * animals.
-         */
-
-        @BeforeClass
-        public static void setUpClass() {
-                int[][] labyrinth = LabyrinthGenerator.readFromFile(COMPETITION_MAZE_FILE);
-                Maze m = new Maze(labyrinth);
-                Simulation simulation = new MazeSimulation(m);
-
-                // adds a Mouse
-                m.addAnimal(new Mouse(m.getStart()));
-
-                // adds a Monkey
-                m.addAnimal(new Monkey(m.getStart()));
-
-                // adds a Hamster
-                m.addAnimal(new Hamster(m.getStart()));
-
-                // adds a Bear (if coded)
-                // m.addAnimal(new Bear(m.getStart()));
-
-                // adds a Panda
-                m.addAnimal(new Panda(m.getStart()));
-
-                // adds a Space Invader
-                m.addAnimal(new SpaceInvader(m.getStart()));
-
-                rivalries = new HashMap<String, Integer>();
-                rivalries.put("Mouse", 0);
-                rivalries.put("Hamster", 0);
-                rivalries.put("Monkey", 0);
-                //rivalries.put("Bear", 0); // if coded
-                rivalries.put("Panda", 0);
-
-                System.out.print("Launching competition, please wait... ");
-                for (int i = 0; i < NUMBER_OF_ROUNDS; i++) {
-                        simulation.restart();
-                        while (!simulation.isOver()) {
-                                simulation.move(null);
-                        }
-
-                        int result = MazeSimulation.COUNTER_LIMIT;
-                        Map<Integer, List<Animal>> arrivalTimes = simulation.getArrivalTimes();
-                        for (Map.Entry<Integer, List<Animal>> entry : arrivalTimes.entrySet()) {
-                                for (Animal a : entry.getValue()) {
-                                        if (a.getClass() == SpaceInvader.class) {
-                                                result = entry.getKey();
-                                        }
-                                }
-                        }
-
-                        for (Map.Entry<Integer, List<Animal>> entry : arrivalTimes.entrySet()) {
-                                for (Animal a : entry.getValue()) {
-                                        String animalName = a.getClass().getSimpleName();
-                                        if (!"SpaceInvader".equals(animalName)) {
-                                                int score = rivalries.get(animalName);
-                                                int adversary = entry.getKey();
-                                                if (adversary < result) {
-                                                        rivalries.put(animalName, --score);
-                                                } else if (adversary > result) {
-                                                        rivalries.put(animalName, ++score);
-                                                }
-                                        }
-                                }
-                        }
-                }
-                System.out.println("done !");
-        }
-
-        /**
-         * Determines if the {@code SpaceInvader} has beaten the {@code Mouse}.
-         */
-
-        @Test
-        public void testVSMouse() {
-                assertTrue("The SpaceInvader has not beaten the Mouse", rivalries.get("Mouse") > 0);
-        }
-
-        /**
-         * Determines if the {@code SpaceInvader} has beaten the {@code Hamster}.
-         */
-
-        @Test
-        public void testVSHamster() {
-                assertTrue("The SpaceInvader has not beaten the Hamster", rivalries.get("Hamster") > 0);
-        }
-
-        /**
-         * Determines if the {@code SpaceInvader} has beaten the {@code Monkey}.
-         */
-
-        @Test
-        public void testVSMonkey() {
+    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
+     * animals.
+     */
+
+    @BeforeClass
+    public static void setUpClass() {
+        int[][] labyrinth = LabyrinthGenerator.readFromFile(COMPETITION_MAZE_FILE);
+        Maze m = new Maze(labyrinth);
+        Simulation simulation = new MazeSimulation(m);
+
+        // adds a Mouse
+        m.addAnimal(new Mouse(m.getStart()));
+
+        // adds a Monkey
+        m.addAnimal(new Monkey(m.getStart()));
+
+        // adds a Hamster
+        m.addAnimal(new Hamster(m.getStart()));
+
+        // adds a Bear (if coded)
+        // m.addAnimal(new Bear(m.getStart()));
+
+        // adds a Panda
+        m.addAnimal(new Panda(m.getStart()));
+
+        // adds a Space Invader
+        m.addAnimal(new SpaceInvader(m.getStart()));
+
+        rivalries = new HashMap<String, Integer>();
+        rivalries.put("Mouse", 0);
+        rivalries.put("Hamster", 0);
+        rivalries.put("Monkey", 0);
+        //rivalries.put("Bear", 0); // if coded
+        rivalries.put("Panda", 0);
+
+        System.out.print("Launching competition, please wait... ");
+        for (int i = 0; i < NUMBER_OF_ROUNDS; i++) {
+            simulation.restart();
+            while (!simulation.isOver()) {
+                simulation.move(null);
+            }
+
+            int result = MazeSimulation.COUNTER_LIMIT;
+            Map<Integer, List<Animal>> arrivalTimes = simulation.getArrivalTimes();
+            for (Map.Entry<Integer, List<Animal>> entry : arrivalTimes.entrySet()) {
+                for (Animal a : entry.getValue()) {
+                    if (a.getClass() == SpaceInvader.class) {
+                        result = entry.getKey();
+                    }
+                }
+            }
+
+            for (Map.Entry<Integer, List<Animal>> entry : arrivalTimes.entrySet()) {
+                for (Animal a : entry.getValue()) {
+                    String animalName = a.getClass().getSimpleName();
+                    if (!"SpaceInvader".equals(animalName)) {
+                        int score = rivalries.get(animalName);
+                        int adversary = entry.getKey();
+                        if (adversary < result) {
+                            rivalries.put(animalName, --score);
+                        } else if (adversary > result) {
+                            rivalries.put(animalName, ++score);
+                        }
+                    }
+                }
+            }
+        }
+        System.out.println("done !");
+    }
+
+    /**
+     * Determines if the {@code SpaceInvader} has beaten the {@code Mouse}.
+     */
+
+    @Test
+    public void testVSMouse() {
+        assertTrue("The SpaceInvader has not beaten the Mouse", rivalries.get("Mouse") > 0);
+    }
+
+    /**
+     * Determines if the {@code SpaceInvader} has beaten the {@code Hamster}.
+     */
+
+    @Test
+    public void testVSHamster() {
+        assertTrue("The SpaceInvader has not beaten the Hamster", rivalries.get("Hamster") > 0);
+    }
+
+    /**
+     * Determines if the {@code SpaceInvader} has beaten the {@code Monkey}.
+     */
+
+    @Test
+    public void testVSMonkey() {