Синхронизировал readme.md и код

Author: denrus

README.md

@@ -257,18 +257,24 @@ TODO
 
 ```
 match
+num_bots {NUM_BOTS}
+##MatchConfig
 mode {MATCH_MODE}
 num_rounds {NUM_ROUNDS}
-num_bots {NUM_BOTS}
+random_seed {RANDOM_SEED}
+move_time_limit {MOVE_TIME_LIMIT}
+coin_spawn_period {COIN_SPAWN_PERIOD}
+coin_spawn_volume {COIN_SPAWN_VOLUME}
+##MapConfig
 map_size {MAP_WIDTH} {MAP_HEIGHT}
 view_radius {VIEW_RADIUS}
 mining_radius {MINING_RADIUS}
 attack_radius {ATTACK_RADIUS}
-move_time_limit {MOVE_TIME_LIMIT}
+block {X} {Y}
+##BotsAndCoinsInfo
 bot_name {BOT_ID} {BOT_NAME}
 bot {BOT_ID} {X} {Y}
 bot_coins {BOT_ID} {NUM_COINS}
-block {X} {Y}
 coin {X} {Y}
 round {ROUND}
 bot {BOT_ID} {X} {Y}

common/src/main/java/ru/croccode/hypernull/geometry/Point.java

@@ -113,4 +113,8 @@ public int hashCode() {
 	public String toString() {
 		return "(" + x + ", " + y + ")";
 	}
+
+	public String toLog() {
+		return x + " " + y;
+	}
 }

server/src/main/java/ru/croccode/hypernull/match/MatchConfig.java

@@ -5,11 +5,11 @@
 
 public class MatchConfig {
 
-	private final long randomSeed;
+	private final MatchMode mode;
 
 	private final int numRounds;
 
-	private final MatchMode mode;
+	private final long randomSeed;
 
 	private final long moveTimeLimit;
 

server/src/main/java/ru/croccode/hypernull/server/MatchFileLogger.java

@@ -2,6 +2,7 @@
 
 import ru.croccode.hypernull.domain.MatchMap;
 import ru.croccode.hypernull.geometry.Point;
+import ru.croccode.hypernull.geometry.Size;
 import ru.croccode.hypernull.match.MatchConfig;
 import ru.croccode.hypernull.match.MatchListener;
 
@@ -39,35 +40,46 @@ public MatchFileLogger(String logsFolder) {
     @Override
     public void matchStarted(MatchMap map, MatchConfig config, Map<K, String> botNames) {
         write("match");
-        for (Field declaredField : config.getClass().getDeclaredFields()) {
-            try {
-                declaredField.setAccessible(true);
-                write(declaredField.getName() + " " + declaredField.get(config));
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(
-                    "Ошибка получения значения поля через рефлексию: " + e.getMessage(),
-                    e
-                );
-            }
-        }
+        write("num_bots " + botNames.size());
+        write("##MatchConfig");
+        printAllFields(config);
+        write("##MapConfig");
+        final Size mapSize = map.getSize();
+        write("map_size " + mapSize.width() + " " + mapSize.height());
+        write("view_radius " + map.getViewRadius());
+        write("mining_radius " + map.getMiningRadius());
+        write("attack_radius " + map.getAttackRadius());
+        printAllBlocks(map);
+        write("##BotsAndCoinsInfo");
         for (Map.Entry<K, String> botEntry : botNames.entrySet()) {
             write("bot_name " + botEntry.getKey() + " " + botEntry.getValue());
         }
     }
 
+    private void printAllBlocks(MatchMap map) {
+        for (int row = 0; row < map.getHeight(); row++) {
+            for (int column = 0; column < map.getWidth(); column++) {
+                Point somePoint = new Point(column, row);
+                if (map.isBlocked(somePoint)) {
+                    write("block " + somePoint.toLog());
+                }
+            }
+        }
+    }
+
     @Override
     public void matchRound(int round) {
         write("round " + round);
     }
 
     @Override
     public void coinSpawned(Point position) {
-        write("coin " + position.toString());
+        write("coin " + position.toLog());
     }
 
     @Override
     public void coinCollected(Point position, K botKey) {
-        write("coin_collected " + position.toString() + " " + botKey);
+        write("coin_collected " + position.toLog() + " " + botKey);
     }
 
     @Override
@@ -77,7 +89,7 @@ public void botSpawned(K botKey, Point position) {
 
     @Override
     public void botMoved(K botKey, Point position) {
-        write("bot " + botKey + " " + position.toString());
+        write("bot " + botKey + " " + position.toLog());
     }
 
     @Override
@@ -103,4 +115,23 @@ private void write(String msg) {
     public void close() {
         logWriter.close();
     }
+
+    private void printAllFields(Object someObj) {
+        final Class<?> objClass = someObj.getClass();
+        for (Field declaredField : objClass.getDeclaredFields()) {
+            try {
+                declaredField.setAccessible(true);
+                final String filedName = declaredField.getName()
+                    .replaceAll("([A-Z][a-z])", "_$1")
+                    .toLowerCase();
+                write(filedName + " " + declaredField.get(someObj));
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(
+                    "Ошибка получения значения поля для класса " + objClass.getSimpleName()
+                        + " через рефлексию: " + e.getMessage(),
+                    e
+                );
+            }
+        }
+    }
 }