Move Simulator stuff to sim package. Added some grid/map related things

Author: Bytekeeper

build.gradle.kts

@@ -20,7 +20,7 @@ repositories {
 
 dependencies {
     implementation(fileTree("lib").include("*.jar"))
-    implementation("com.github.JavaBWAPI:JBWAPI:0.7.2")
+    implementation("com.github.JavaBWAPI:JBWAPI:0.8.2")
 
     testImplementation("org.junit.jupiter:junit-jupiter:5.5.1")
     testImplementation("org.assertj:assertj-core:3.13.2")

src/jmh/java/org/bk/ass/EvaluatorBenchmark.java

@@ -1,5 +1,8 @@
 package org.bk.ass;
 
+import org.bk.ass.sim.Agent;
+import org.bk.ass.sim.BWAPI4JAgentFactory;
+import org.bk.ass.sim.Evaluator;
 import org.openbw.bwapi4j.test.BWDataProvider;
 import org.openbw.bwapi4j.type.UnitType;
 import org.openjdk.jmh.annotations.*;

src/jmh/java/org/bk/ass/SimulatorBenchmark.java

@@ -1,5 +1,7 @@
 package org.bk.ass;
 
+import org.bk.ass.sim.BWAPI4JAgentFactory;
+import org.bk.ass.sim.Simulator;
 import org.openbw.bwapi4j.test.BWDataProvider;
 import org.openbw.bwapi4j.type.UnitType;
 import org.openjdk.jmh.annotations.*;

src/jmh/java/org/bk/ass/path/JpsBenchmark.java

@@ -16,7 +16,7 @@ public class JpsBenchmark {
   @State(Scope.Thread)
   public static class MyState {
     List<Position[]> positions;
-    Map map;
+    PPMap map;
     Jps jps;
     PPJps PPJps;
 
@@ -30,7 +30,7 @@ public void setup() throws IOException {
           data[x][y] = image.getRGB(x, y) == -1;
         }
       }
-      map = Map.fromBooleanArray(data);
+      map = PPMap.fromBooleanArray(data);
       jps = new Jps(map);
       PPJps = new PPJps(map);
 

src/main/java/org/bk/ass/PositionOutOfBoundsException.java

@@ -3,7 +3,7 @@
 /** Thrown if a position is not within the required bounds. */
 public class PositionOutOfBoundsException extends RuntimeException {
 
-  PositionOutOfBoundsException(String message) {
+  public PositionOutOfBoundsException(String message) {
     super(message);
   }
 }

src/main/java/org/bk/ass/grid/Grids.java

@@ -0,0 +1,73 @@
+package org.bk.ass.grid;
+
+import bwapi.Game;
+import org.openbw.bwapi4j.BWMap;
+
+public final class Grids {
+  private Grids() {
+    // Utility class
+  }
+
+  public static Grid<Boolean> fromBooleanArray(boolean[][] map) {
+    return new Grid<Boolean>() {
+      @Override
+      public Boolean get(int x, int y) {
+        return y >= 0 && y < map[0].length && x >= 0 && x < map.length && map[x][y];
+      }
+
+      @Override
+      public int getWidth() {
+        return map.length;
+      }
+
+      @Override
+      public int getHeight() {
+        return map[0].length;
+      }
+    };
+  }
+
+  public static Grid<Boolean> fromTileWalkability(Game game) {
+    return new Grid<Boolean>() {
+      @Override
+      public int getWidth() {
+        return game.mapWidth();
+      }
+
+      @Override
+      public int getHeight() {
+        return game.mapHeight();
+      }
+
+      @Override
+      public Boolean get(int x, int y) {
+        return game.isWalkable(x * 4, y * 4)
+            && game.isWalkable(x * 4 + 1, y * 4)
+            && game.isWalkable(x * 4, y * 4 + 1)
+            && game.isWalkable(x * 4 + 1, y * 4 + 1);
+      }
+    };
+  }
+
+  public static Grid<Boolean> fromTileWalkability(BWMap map) {
+    return new Grid<Boolean>() {
+      @Override
+      public int getWidth() {
+        return map.mapWidth();
+      }
+
+      @Override
+      public int getHeight() {
+        return map.mapHeight();
+      }
+
+      @Override
+      public Boolean get(int x, int y) {
+        return map.isWalkable(x * 4, y * 4)
+            && map.isWalkable(x * 4 + 1, y * 4)
+            && map.isWalkable(x * 4, y * 4 + 1)
+            && map.isWalkable(x * 4 + 1, y * 4 + 1);
+      }
+    };
+  }
+}

src/main/java/org/bk/ass/path/AbstractPathFinder.java

@@ -1,5 +1,7 @@
 package org.bk.ass.path;
 
+import org.bk.ass.grid.Grid;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -12,9 +14,9 @@ abstract class AbstractPathFinder {
   private final PriorityQueue<Node> openQueue = new PriorityQueue<>();
   private final Node[] nodes;
   final Position target;
-  private final Map map;
+  private final Grid<Boolean> map;
 
-  AbstractPathFinder(Position target, Map map) {
+  AbstractPathFinder(Position target, Grid<Boolean> map) {
     this.target = target;
     this.map = map;
     nodes = new Node[map.getHeight() * map.getWidth()];

src/main/java/org/bk/ass/path/Jps.java

@@ -1,16 +1,18 @@
 package org.bk.ass.path;
 
+import org.bk.ass.grid.Grid;
+
 import java.util.Collections;
 
 /**
- * Jump point search. Initialize with a {@link Map} instance and call {@link #findPath(Position,
+ * Jump point search. Initialize with a {@link Grid} instance and call {@link #findPath(Position,
  * Position)}.
  */
 public class Jps {
 
-  private final Map map;
+  private final Grid<Boolean> map;
 
-  public Jps(Map map) {
+  public Jps(Grid<Boolean> map) {
     this.map = map;
   }
 
@@ -29,9 +31,9 @@ public Result findPath(Position start, Position end) {
 
   private static class PathFinder extends AbstractPathFinder {
 
-    private final Map map;
+    private final Grid<Boolean> map;
 
-    protected PathFinder(Position target, Map map) {
+    protected PathFinder(Position target, Grid<Boolean> map) {
       super(target, map);
       this.map = map;
     }

src/main/java/org/bk/ass/path/Map.java

@@ -1,9 +1,11 @@
 package org.bk.ass.path;
 
+import org.bk.ass.grid.Grid;
+
 import java.util.Collections;
 
 /**
- * Jump point search. Initialize with a {@link Map} instance and call {@link #findPath(Position,
+ * Jump point search. Initialize with a {@link PPMap} instance and call {@link #findPath(Position,
  * Position)}. This implementation uses preprocessed maps to improve runtime performance (~40%).
  * (Note: This is not JPS+, only verticals and horizontals are precomputed)
  */
@@ -15,7 +17,7 @@ public PPJps(PPMap map) {
     this.map = map;
   }
 
-  public PPJps(Map map) {
+  public PPJps(Grid<Boolean> map) {
     this(PPMap.fromMap(map));
   }