Some inlining; TileData now directly returns tiles/minitiles (and can therefore just use arrays internally).

Author: bytekeeper

src/main/java/bwem/AreaInitializer.java

@@ -522,7 +522,7 @@ private boolean validateBaseLocation(
         // checks the distance to the bases already created:
         for (final Base base : getBases()) {
             if (BwemExt.roundedDist(base.getLocation(), location)
-                < BwemExt.min_tiles_between_Bases) {
+                < BwemExt.MIN_TILES_BETWEEN_BASES) {
                 return false;
             }
         }

src/main/java/bwem/BWMapInitializer.java

@@ -31,12 +31,12 @@ void initialize() {
 
         // Computes walkability, buildability and groundHeight and doodad information, using BWAPI
         // corresponding functions
-        ((TerrainDataInitializer) getData()).markUnwalkableMiniTiles(game);
-        ((TerrainDataInitializer) getData()).markBuildableTilesAndGroundHeight(game);
+        TerrainDataInitializer initializer = (TerrainDataInitializer) getData();
+        initializer.markUnwalkableMiniTiles(game);
+        initializer.markBuildableTilesAndGroundHeight(game);
 
         //
-        ((TerrainDataInitializer) getData())
-                .decideSeasOrLakes(BwemExt.LAKE_MAX_MINI_TILES, BwemExt.LAKE_MAX_WIDTH_IN_MINI_TILES);
+        initializer.decideSeasOrLakes();
 
 
         initializeNeutralData(
@@ -53,7 +53,7 @@ void initialize() {
 
 
         computeAreas(
-                computeTempAreas(getSortedMiniTilesByDescendingAltitude()), BwemExt.AREA_MIN_MINI_TILES);
+                computeTempAreas(getSortedMiniTilesByDescendingAltitude()));
 
 
         getGraph()
@@ -422,8 +422,8 @@ private void markBlockingStackedNeutrals(
     //   - involves the creation of a new area.
     //   - is added to some existing neighboring area.
     //   - makes two neighboring areas merge together.
-    private void computeAreas(final List<TempAreaInfo> tempAreaList, final int areaMinMiniTiles) {
-        createAreas(tempAreaList, areaMinMiniTiles);
+    private void computeAreas(final List<TempAreaInfo> tempAreaList) {
+        createAreas(tempAreaList, BwemExt.AREA_MIN_MINI_TILES);
         setAreaIdAndLowestAltitudeInTiles();
     }
 

src/main/java/bwem/TerrainData.java

@@ -38,8 +38,7 @@ public Tile getTile(final TilePosition tilePosition, final CheckMode checkMode)
             throw new IllegalArgumentException();
         }
         return getTileData()
-                .getTiles()
-                .get(getMapData().getTileSize().getX() * tilePosition.getY() + tilePosition.getX());
+                .getTile(getMapData().getTileSize().getX() * tilePosition.getY() + tilePosition.getX());
     }
 
     public Tile getTile(final TilePosition tilePosition) {
@@ -51,8 +50,7 @@ public MiniTile getMiniTile(final WalkPosition walkPosition, final CheckMode che
             throw new IllegalArgumentException();
         }
         return getTileData()
-                .getMiniTiles()
-                .get(getMapData().getWalkSize().getX() * walkPosition.getY() + walkPosition.getX());
+                .getMiniTile(getMapData().getWalkSize().getX() * walkPosition.getY() + walkPosition.getX());
     }
 
     public MiniTile getMiniTile(final WalkPosition walkPosition) {

src/main/java/bwem/TerrainDataInitializer.java

@@ -82,7 +82,7 @@ void markBuildableTilesAndGroundHeight(final Game game) {
     // BWMap::DecideSeasOrLakes
     ////////////////////////////////////////////////////////////////////////
 
-    void decideSeasOrLakes(final int lakeMaxMiniTiles, final int lakeMaxWidthInMiniTiles) {
+    void decideSeasOrLakes() {
         for (int y = 0; y < getMapData().getWalkSize().getY(); ++y)
             for (int x = 0; x < getMapData().getWalkSize().getX(); ++x) {
                 final WalkPosition originWalkPosition = new WalkPosition(x, y);
@@ -120,7 +120,7 @@ void decideSeasOrLakes(final int lakeMaxMiniTiles, final int lakeMaxWidthInMiniT
                                 final MiniTile nextMiniTile = getMiniTile(nextWalkPosition, CheckMode.NO_CHECK);
                                 if (nextMiniTile.isSeaOrLake()) {
                                     toSearch.add(nextWalkPosition);
-                                    if (seaExtent.size() <= lakeMaxMiniTiles) {
+                                    if (seaExtent.size() <= bwem.util.BwemExt.LAKE_MAX_MINI_TILES) {
                                         seaExtent.add(nextMiniTile);
                                     }
                                     nextMiniTile.setSea();
@@ -129,9 +129,9 @@ void decideSeasOrLakes(final int lakeMaxMiniTiles, final int lakeMaxWidthInMiniT
                         }
                     }
 
-                    if ((seaExtent.size() <= lakeMaxMiniTiles)
-                            && (bottomRightX - topLeftX <= lakeMaxWidthInMiniTiles)
-                            && (bottomRightY - topLeftY <= lakeMaxWidthInMiniTiles)
+                    if ((seaExtent.size() <= bwem.util.BwemExt.LAKE_MAX_MINI_TILES)
+                            && (bottomRightX - topLeftX <= bwem.util.BwemExt.LAKE_MAX_WIDTH_IN_MINI_TILES)
+                            && (bottomRightY - topLeftY <= bwem.util.BwemExt.LAKE_MAX_WIDTH_IN_MINI_TILES)
                             && (topLeftX >= 2)
                             && (topLeftY >= 2)
                             && (bottomRightX < getMapData().getWalkSize().getX() - 2)

src/main/java/bwem/TileData.java

@@ -12,30 +12,28 @@
 
 package bwem;
 
-import java.util.ArrayList;
-import java.util.List;
-
 class TileData {
-    private final List<Tile> tiles;
-    private final List<MiniTile> miniTiles;
+
+    private final Tile[] tiles;
+    private final MiniTile[] miniTiles;
 
     TileData(final int tileCount, final int miniTileCount) {
-        this.tiles = new ArrayList<>(tileCount);
+        tiles = new Tile[tileCount];
         for (int i = 0; i < tileCount; ++i) {
-            this.tiles.add(new Tile());
+            tiles[i] = new Tile();
         }
 
-        this.miniTiles = new ArrayList<>(miniTileCount);
+        miniTiles = new MiniTile[miniTileCount];
         for (int i = 0; i < miniTileCount; ++i) {
-            this.miniTiles.add(new MiniTile());
+            miniTiles[i] = new MiniTile();
         }
     }
 
-    List<Tile> getTiles() {
-        return this.tiles;
+    Tile getTile(int index) {
+        return tiles[index];
     }
 
-    List<MiniTile> getMiniTiles() {
-        return this.miniTiles;
+    MiniTile getMiniTile(int index) {
+        return miniTiles[index];
     }
 }

src/main/java/bwem/util/BwemExt.java

@@ -28,7 +28,7 @@ public final class BwemExt {
     // At least AREA_MIN_MINI_TILES connected MiniTiles are necessary for an Area to be created.
     public static final int AREA_MIN_MINI_TILES = 64;
     public static final int MAX_TILES_BETWEEN_COMMAND_CENTER_AND_RESOURCES = 10;
-    public static final int min_tiles_between_Bases = 10;
+    public static final int MIN_TILES_BETWEEN_BASES = 10;
     public static final int MAX_TILES_BETWEEN_STARTING_LOCATION_AND_ITS_ASSIGNED_BASE = 3;
     private static final int TILE_POSITION_CENTER_OFFSET_IN_PIXELS = TilePosition.SIZE_IN_PIXELS / 2;
     private static final Position TILE_POSITION_CENTER_IN_PIXELS =