remove height and width from map.config

Author: MohsenDehghankar

map.config

@@ -12,8 +12,6 @@ CHAT_LIMIT = 5
 MAX_MESSAGE_LENGTH = 32
 GAME_MAXIMUM_TURN_COUNT = 50
 RATE_DEATH_RESOURCE = 0.8
-MAP_WIDTH = 32
-MAP_HEIGHT = 32
 BASE_MAX_ATTACK_DISTANCE = 6
 BASE_ATTACK_DAMAGE = 3
 BASE_INIT_HEALTH = 10

src/main/java/ir/sharif/aichallenge/server/engine/network/ClientHandler.java

@@ -33,7 +33,7 @@ public class ClientHandler {
     /**
      * Maximum number of exceptions during connection.
      */
-    public static final int MAX_NUM_EXCEPTIONS = 20;
+    public static final int MAX_NUM_EXCEPTIONS = 5;
 
     /**
      * Logging tag.
@@ -79,6 +79,8 @@ public class ClientHandler {
      */
     private final Object messageNotifier;
 
+    private int maxSendingFails = 0;
+
     /**
      * Message queue. These messages will be sent to the client asap.
      */
@@ -181,6 +183,11 @@ public Runnable getSender() {
                     client.send(msg);
                 } catch (Exception e) {
                     Log.i(logTag, "Message sending failure", e);
+                    maxSendingFails++;
+                    if (maxSendingFails > MAX_NUM_EXCEPTIONS) {
+                        Log.e("ClientHandler", "Max number of sending failure expections reached");
+                        System.exit(-1);
+                    }
                 }
             }
         };

src/main/java/ir/sharif/aichallenge/server/logic/Main.java

@@ -45,7 +45,7 @@ private static int extractExtraTime(String[] args) {
 class ShutDownHookThread extends Thread {
     @Override
     public void run() {
-        System.out.println("\u001B[31m" + "Bye!" + "\u001B[0m");
+        Log.i("Server", "\u001B[31m" + "Bye!" + "\u001B[0m");
         // kill ants
         AntGenerator.killAnts();
         super.run();

src/main/java/ir/sharif/aichallenge/server/logic/config/ConfigReader.java

@@ -45,8 +45,8 @@ public static void readConfigFile() {
             ConstConfigs.MAX_MESSAGE_LENGTH = Integer.parseInt(props.getProperty("MAX_MESSAGE_LENGTH"));
             ConstConfigs.GAME_MAXIMUM_TURN_COUNT = Integer.parseInt(props.getProperty("GAME_MAXIMUM_TURN_COUNT"));
             ConstConfigs.RATE_DEATH_RESOURCE = Float.parseFloat(props.getProperty("RATE_DEATH_RESOURCE"));
-            ConstConfigs.MAP_WIDTH = Integer.parseInt(props.getProperty("MAP_WIDTH"));
-            ConstConfigs.MAP_HEIGHT = Integer.parseInt(props.getProperty("MAP_HEIGHT"));
+            // ConstConfigs.MAP_WIDTH = Integer.parseInt(props.getProperty("MAP_WIDTH"));
+            // ConstConfigs.MAP_HEIGHT = Integer.parseInt(props.getProperty("MAP_HEIGHT"));
             ConstConfigs.BASE_MAX_ATTACK_DISTANCE = Integer.parseInt(props.getProperty("BASE_MAX_ATTACK_DISTANCE"));
             ConstConfigs.BASE_ATTACK_DAMAGE = Integer.parseInt(props.getProperty("BASE_ATTACK_DAMAGE"));
             ConstConfigs.BASE_INIT_HEALTH = Integer.parseInt(props.getProperty("BASE_INIT_HEALTH"));

src/main/java/ir/sharif/aichallenge/server/logic/model/map/MapGenerator.java

@@ -62,11 +62,11 @@ else if (cellTypeSelector < breadCellProb + grassCellProb + wallCellProb)
     }
 
     public static MapGeneratorResult generateFromFile(String fileName) {
-        int height = ConstConfigs.MAP_HEIGHT;
-        int width = ConstConfigs.MAP_WIDTH;
+        // int height = ConstConfigs.MAP_HEIGHT;
+        // int width = ConstConfigs.MAP_WIDTH;
         try {
-            ExternalMap externalMap = JsonUtility.readMapFromFile(fileName, height, width);
-            GameMap gameMap = new GameMap(externalMap.getCells(), height, width);
+            ExternalMap externalMap = JsonUtility.readMapFromFile(fileName);
+            GameMap gameMap = new GameMap(externalMap.getCells(), ConstConfigs.MAP_HEIGHT, ConstConfigs.MAP_WIDTH);
             List<BaseCell> baseCells = externalMap.getUnAllocatedBaseCells();
             if (baseCells.size() < 2) {
                 Log.e("MapGenerator", "There should be two base cells in map.json!");

src/main/java/ir/sharif/aichallenge/server/logic/utility/AntGenerator.java

@@ -39,7 +39,7 @@ public void run() {
                     try {
                         Thread.sleep(PROCESS_TIMEOUT_SECONDS * 1000);
                         if (waitingProcessIDs.contains(antID)) {
-                            System.out.println("\u001B[31mClient Process Timeout passed\u001B[0m");
+                            Log.e("DEAD_POINT", "\u001B[31mClient Process Timeout passed\u001B[0m");
                             killAnts();
                             System.exit(-1);
                         }

src/main/java/ir/sharif/aichallenge/server/logic/utility/JsonUtility.java

@@ -17,7 +17,7 @@
 
 public class JsonUtility {
 
-    public static ExternalMap readMapFromFile(String fileName, int height, int width)
+    public static ExternalMap readMapFromFile(String fileName)
             throws IOException, ParseException {
 
         JSONParser jsonParser = new JSONParser();
@@ -31,8 +31,8 @@ public static ExternalMap readMapFromFile(String fileName, int height, int width
                 System.exit(-1);
             }
             JSONArray cells = (JSONArray) map.get("cells_type");
-            height = ConstConfigs.MAP_HEIGHT;
-            width = ConstConfigs.MAP_WIDTH;
+            int height = ConstConfigs.MAP_HEIGHT;
+            int width = ConstConfigs.MAP_WIDTH;
             Cell[][] mapCells = new Cell[height][width];
             ExternalMap externalMap = new ExternalMap(mapCells);
             for (Object o : cells) {