Merge branch '10_graphical_interface'

Conflicts:
	src/ch/epfl/xblast/Lists.java

5 files changed, 206 insertions, 84 deletions

diff --git a/test/ch/epfl/xblast/ListsTest.java b/test/ch/epfl/xblast/ListsTest.java
index b18b05e..e62eede 100644
--- a/test/ch/epfl/xblast/ListsTest.java
+++ b/test/ch/epfl/xblast/ListsTest.java
@@ -2,10 +2,7 @@ package ch.epfl.xblast;
 
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
@@ -63,4 +60,46 @@ public class ListsTest {
         assertEquals(expected, Lists.permutations(sampleList));
     }
 
+    @Test
+    public void areListsMapped() {
+        final List<Character> keyList = Arrays.asList('a', 'b');
+        final List<Integer> valueList = Arrays.asList(0, 1);
+
+        final Map<Character, Integer> expectedMap = new HashMap<>();
+        expectedMap.put('a', 0);
+        expectedMap.put('b', 1);
+
+        assertEquals(expectedMap, Lists.linearMap(keyList, valueList));
+    }
+
+    @Test
+    public void areMapsTraversed() {
+        final Map<Character, Integer> m1 = new HashMap<>();
+        m1.put('a', 0);
+        m1.put('b', 1);
+
+        final Map<Integer, String> m2 = new HashMap<>();
+        m2.put(0, "Apple");
+        m2.put(1, "Banana");
+
+        final Map<Character, String> expectedMap = new HashMap<>();
+        expectedMap.put('a', "Apple");
+        expectedMap.put('b', "Banana");
+
+        assertEquals(expectedMap, Lists.traverseMaps(m1, m2));
+    }
+
+    @Test
+    public void isMapInverted() {
+        final Map<Character, Integer> sampleMap = new HashMap<>();
+        sampleMap.put('a', 0);
+        sampleMap.put('b', 1);
+
+        final Map<Integer, Character> expectedMap = new HashMap<>();
+        expectedMap.put(0, 'a');
+        expectedMap.put(1, 'b');
+
+        assertEquals(expectedMap, Lists.invertMap(sampleMap));
+    }
+
 }
diff --git a/test/ch/epfl/xblast/simulation/ConsoleSimulation.java b/test/ch/epfl/xblast/simulation/ConsoleSimulation.java
new file mode 100644
index 0000000..b029afb
--- /dev/null
+++ b/test/ch/epfl/xblast/simulation/ConsoleSimulation.java
@@ -0,0 +1,23 @@
+package ch.epfl.xblast.simulation;
+
+import ch.epfl.xblast.server.GameState;
+import ch.epfl.xblast.server.debug.GameStatePrinter;
+
+/**
+ * Random game simulation printed in the console.
+ *
+ * @author Pacien TRAN-GIRARD (261948)
+ */
+public class ConsoleSimulation extends Simulation {
+
+    @Override
+    void displayGameState(GameState gs) {
+        GameStatePrinter.printGameState(gs);
+        delay();
+    }
+
+    public static void main(String[] args) {
+        (new ConsoleSimulation()).runSimulation();
+    }
+
+}
diff --git a/test/ch/epfl/xblast/simulation/GraphicalSimulation.java b/test/ch/epfl/xblast/simulation/GraphicalSimulation.java
new file mode 100644
index 0000000..9329cc7
--- /dev/null
+++ b/test/ch/epfl/xblast/simulation/GraphicalSimulation.java
@@ -0,0 +1,86 @@
+package ch.epfl.xblast.simulation;
+
+import ch.epfl.xblast.PlayerAction;
+import ch.epfl.xblast.PlayerID;
+import ch.epfl.xblast.client.GameStateDeserializer;
+import ch.epfl.xblast.client.KeyboardEventHandler;
+import ch.epfl.xblast.client.XBlastComponent;
+import ch.epfl.xblast.server.GameState;
+import ch.epfl.xblast.server.GameStateSerializer;
+import ch.epfl.xblast.server.Level;
+import ch.epfl.xblast.server.painter.BoardPainter;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.KeyEvent;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+/**
+ * Graphical game simulation.
+ *
+ * @author Timothée FLOURE (257420)
+ * @author Pacien TRAN-GIRARD (261948)
+ */
+public class GraphicalSimulation extends Simulation {
+
+    private static final BoardPainter BOARD_PAINTER = Level.DEFAULT_LEVEL.painter();
+    private static final Consumer<PlayerAction> PLAYER_ACTION_CONSUMER = System.out::println;
+    private static final PlayerID MAIN_PLAYER = PlayerID.PLAYER_1;
+
+    private static Map<Integer, PlayerAction> buildPlayerActionMap() {
+        Map<Integer, PlayerAction> playerActionMap = new HashMap<>();
+
+        playerActionMap.put(KeyEvent.VK_UP, PlayerAction.MOVE_N);
+        playerActionMap.put(KeyEvent.VK_RIGHT, PlayerAction.MOVE_E);
+        playerActionMap.put(KeyEvent.VK_DOWN, PlayerAction.MOVE_S);
+        playerActionMap.put(KeyEvent.VK_LEFT, PlayerAction.MOVE_W);
+        playerActionMap.put(KeyEvent.VK_SPACE, PlayerAction.DROP_BOMB);
+        playerActionMap.put(KeyEvent.VK_SHIFT, PlayerAction.STOP);
+
+        return Collections.unmodifiableMap(playerActionMap);
+    }
+
+    private static ch.epfl.xblast.client.GameState translateToClientData(GameState gs) {
+        List<Byte> serializedGameState = GameStateSerializer.serialize(BOARD_PAINTER, gs);
+        return GameStateDeserializer.deserialize(serializedGameState);
+    }
+
+    private static JFrame buildFrame(Container content) {
+        JFrame frame = new JFrame();
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+        frame.setVisible(true);
+
+        frame.setContentPane(content);
+        frame.pack();
+        return frame;
+    }
+
+    private void attachKeyboardHandler(Component comp) {
+        comp.addKeyListener(new KeyboardEventHandler(buildPlayerActionMap(), PLAYER_ACTION_CONSUMER));
+        comp.requestFocusInWindow();
+    }
+
+    private final XBlastComponent gui;
+
+    private GraphicalSimulation() {
+        this.gui = new XBlastComponent();
+        buildFrame(this.gui);
+        attachKeyboardHandler(this.gui);
+    }
+
+    @Override
+    void displayGameState(GameState gs) {
+        this.gui.setGameState(translateToClientData(gs), MAIN_PLAYER);
+        delay();
+    }
+
+    public static void main(String[] args) {
+        (new GraphicalSimulation()).runSimulation();
+    }
+
+}
diff --git a/test/ch/epfl/xblast/simulation/RandomSimulation.java b/test/ch/epfl/xblast/simulation/RandomSimulation.java
deleted file mode 100644
index 3888650..0000000
--- a/test/ch/epfl/xblast/simulation/RandomSimulation.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package ch.epfl.xblast.simulation;
-
-import ch.epfl.xblast.Cell;
-import ch.epfl.xblast.PlayerID;
-import ch.epfl.xblast.server.Board;
-import ch.epfl.xblast.server.BoardTest;
-import ch.epfl.xblast.server.GameState;
-import ch.epfl.xblast.server.Player;
-import ch.epfl.xblast.server.debug.GameStatePrinter;
-import ch.epfl.xblast.server.debug.RandomEventGenerator;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Random game simulation.
- *
- * @author Pacien TRAN-GIRARD (261948)
- */
-public class RandomSimulation {
-
-    private static final long DISPLAY_DELAY = 50; // in milliseconds
-
-    private static final int PLAYER_LIVES = 4;
-    private static final int PLAYER_MAX_BOMBS = 4;
-    private static final int PLAYER_BOMB_RANGE = 4;
-
-    private static final int SEED = 2016;
-    private static final int SPEED_CHANGE_PROB = 30;
-    private static final int BOMB_PROB = 100;
-    private static final RandomEventGenerator RANDOM_EVENT_GENERATOR = new RandomEventGenerator(SEED, SPEED_CHANGE_PROB, BOMB_PROB);
-
-    private static Board buildTestBoard() {
-        return Board.ofQuadrantNWBlocksWalled(BoardTest.buildNWQuadrantMap());
-    }
-
-    private static Player newPlayer(PlayerID id, Cell pos) {
-        return new Player(id, PLAYER_LIVES, pos, PLAYER_MAX_BOMBS, PLAYER_BOMB_RANGE);
-    }