diff options
Diffstat (limited to 'src/ch/epfl/maze/main')
-rw-r--r-- | src/ch/epfl/maze/main/Console.java | 5 | ||||
-rw-r--r-- | src/ch/epfl/maze/main/Program.java | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/ch/epfl/maze/main/Console.java b/src/ch/epfl/maze/main/Console.java index cbcb8dc..931bec4 100644 --- a/src/ch/epfl/maze/main/Console.java +++ b/src/ch/epfl/maze/main/Console.java | |||
@@ -22,7 +22,6 @@ import java.util.Map; | |||
22 | * Mini-project main program that will run the simulations multiple times and | 22 | * Mini-project main program that will run the simulations multiple times and |
23 | * show statistics on the console. | 23 | * show statistics on the console. |
24 | */ | 24 | */ |
25 | |||
26 | public class Console { | 25 | public class Console { |
27 | 26 | ||
28 | /** | 27 | /** |
@@ -52,7 +51,6 @@ public class Console { | |||
52 | * | 51 | * |
53 | * @return A {@code MazeSimulation} suitable for statistics | 52 | * @return A {@code MazeSimulation} suitable for statistics |
54 | */ | 53 | */ |
55 | |||
56 | public static Simulation getMazeSimulation() { | 54 | public static Simulation getMazeSimulation() { |
57 | int[][] labyrinth = LabyrinthGenerator.getMedium(); | 55 | int[][] labyrinth = LabyrinthGenerator.getMedium(); |
58 | Maze m = new Maze(labyrinth); | 56 | Maze m = new Maze(labyrinth); |
@@ -84,7 +82,6 @@ public class Console { | |||
84 | * | 82 | * |
85 | * @return A {@code DaedalusSimulation} suitable for statistics | 83 | * @return A {@code DaedalusSimulation} suitable for statistics |
86 | */ | 84 | */ |
87 | |||
88 | public static Simulation getDaedalusSimulation() { | 85 | public static Simulation getDaedalusSimulation() { |
89 | int[][] labyrinth = LabyrinthGenerator.getPacMan(); | 86 | int[][] labyrinth = LabyrinthGenerator.getPacMan(); |
90 | Daedalus d = new Daedalus(labyrinth); | 87 | Daedalus d = new Daedalus(labyrinth); |
@@ -113,7 +110,6 @@ public class Console { | |||
113 | * | 110 | * |
114 | * @param results Statistics of arrival times for every animals/preys | 111 | * @param results Statistics of arrival times for every animals/preys |
115 | */ | 112 | */ |
116 | |||
117 | public static void printStats(Map<String, List<Integer>> results) { | 113 | public static void printStats(Map<String, List<Integer>> results) { |
118 | // computes statistics | 114 | // computes statistics |
119 | for (Map.Entry<String, List<Integer>> entry : results.entrySet()) { | 115 | for (Map.Entry<String, List<Integer>> entry : results.entrySet()) { |
@@ -154,4 +150,5 @@ public class Console { | |||
154 | Statistics.printDistribution(list); | 150 | Statistics.printDistribution(list); |
155 | } | 151 | } |
156 | } | 152 | } |
153 | |||
157 | } | 154 | } |
diff --git a/src/ch/epfl/maze/main/Program.java b/src/ch/epfl/maze/main/Program.java index db43a68..043f7e5 100644 --- a/src/ch/epfl/maze/main/Program.java +++ b/src/ch/epfl/maze/main/Program.java | |||
@@ -17,7 +17,6 @@ import ch.epfl.maze.util.Vector2D; | |||
17 | /** | 17 | /** |
18 | * Mini-project main program that will run the simulations on a {@code Display}. | 18 | * Mini-project main program that will run the simulations on a {@code Display}. |
19 | */ | 19 | */ |
20 | |||
21 | public class Program { | 20 | public class Program { |
22 | 21 | ||
23 | /** | 22 | /** |
@@ -26,7 +25,6 @@ public class Program { | |||
26 | * @see #getMazeSimulation() | 25 | * @see #getMazeSimulation() |
27 | * @see #getDaedalusSimulation() | 26 | * @see #getDaedalusSimulation() |
28 | */ | 27 | */ |
29 | |||
30 | public static void main(String[] args) { | 28 | public static void main(String[] args) { |
31 | Simulation simulation; | 29 | Simulation simulation; |
32 | 30 | ||
@@ -42,7 +40,6 @@ public class Program { | |||
42 | * | 40 | * |
43 | * @return A {@code MazeSimulation} to display | 41 | * @return A {@code MazeSimulation} to display |
44 | */ | 42 | */ |
45 | |||
46 | public static Simulation getMazeSimulation() { | 43 | public static Simulation getMazeSimulation() { |
47 | int[][] labyrinth = LabyrinthGenerator.getMedium(); | 44 | int[][] labyrinth = LabyrinthGenerator.getMedium(); |
48 | Maze m = new Maze(labyrinth); | 45 | Maze m = new Maze(labyrinth); |
@@ -72,7 +69,6 @@ public class Program { | |||
72 | * | 69 | * |
73 | * @return A {@code DaedalusSimulation} to display | 70 | * @return A {@code DaedalusSimulation} to display |
74 | */ | 71 | */ |
75 | |||
76 | public static Simulation getDaedalusSimulation() { | 72 | public static Simulation getDaedalusSimulation() { |
77 | int[][] labyrinth = LabyrinthGenerator.getPacMan(); | 73 | int[][] labyrinth = LabyrinthGenerator.getPacMan(); |
78 | Daedalus d = new Daedalus(labyrinth); | 74 | Daedalus d = new Daedalus(labyrinth); |
@@ -97,4 +93,5 @@ public class Program { | |||
97 | 93 | ||
98 | return simulation; | 94 | return simulation; |
99 | } | 95 | } |
96 | |||
100 | } | 97 | } |