Add BWTA warning & more set->list

Author: JasperGeurtz

src/main/java/bwta/BWTA.java

@@ -17,11 +17,12 @@ public class BWTA {
     static Map<Area, Region> regionMap;
     static Map<ChokePoint, Chokepoint> chokeMap;
     static Map<Base, BaseLocation> baseMap;
-    private static Set<Region> regions;
-    private static Set<Chokepoint> chokepoints;
-    private static Set<BaseLocation> baseLocations;
+    private static List<Region> regions;
+    private static List<Chokepoint> chokepoints;
+    private static List<BaseLocation> baseLocations;
 
     public static void readMap(final Game game) {
+        System.err.println("WARNING: this BWTA is fake and only translates BWTA calls to their respective BWEM calls. Please use BWEM directly if possible.");
         bwem = new BWEM(game);
     }
 
@@ -32,37 +33,37 @@ public static void analyze() {
         for (final Area a : bwem.getMap().getAreas()) {
             regionMap.put(a, new Region(a));
         }
-        regions = new HashSet<>(regionMap.values());
+        regions = new ArrayList<>(regionMap.values());
 
         chokeMap = new HashMap<>();
         for (final ChokePoint c : bwem.getMap().getChokePoints()) {
             chokeMap.put(c, new Chokepoint(c));
         }
-        chokepoints = new HashSet<>(chokeMap.values());
+        chokepoints = new ArrayList<>(chokeMap.values());
 
         baseMap = new HashMap<>();
         for (final Base b : bwem.getMap().getBases()) {
             baseMap.put(b, new BaseLocation(b));
         }
-        baseLocations = new HashSet<>(baseMap.values());
+        baseLocations = new ArrayList<>(baseMap.values());
     }
 
-    public static Set<Region> getRegions() {
-        return regions;
+    public static List<Region> getRegions() {
+        return new ArrayList<>(regions);
     }
 
-    public static Set<Chokepoint> getChokepoints() {
-        return chokepoints;
+    public static List<Chokepoint> getChokepoints() {
+        return new ArrayList<>(chokepoints);
     }
 
-    public static Set<BaseLocation> getBaseLocations() {
-        return baseLocations;
+    public static List<BaseLocation> getBaseLocations() {
+        return new ArrayList<>(baseLocations);
     }
 
-    public static Set<BaseLocation> getStartLocations() {
+    public static List<BaseLocation> getStartLocations() {
         return getBaseLocations().stream()
                 .filter(BaseLocation::isStartLocation)
-                .collect(Collectors.toSet());
+                .collect(Collectors.toList());
     }
 
     public static BaseLocation getStartLocation(final Player player) {

src/main/java/bwta/BaseLocation.java

@@ -5,6 +5,8 @@
 import bwapi.Unit;
 import bwem.Base;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -14,8 +16,8 @@ public class BaseLocation {
     private final TilePosition tilePosition;
     private final int minerals;
     private final int gas;
-    private final Set<Unit> mineralSet;
-    private final Set<Unit> geyserSet;
+    private final List<Unit> mineralSet;
+    private final List<Unit> geyserSet;
     private final boolean island;
     private final boolean mineralOnly;
     private final boolean startLocation;
@@ -27,8 +29,8 @@ public class BaseLocation {
         this.tilePosition = base.getLocation();
         this.minerals = 1;
         this.gas = 1;
-        this.mineralSet = base.getMinerals().stream().map(m -> m.getUnit()).collect(Collectors.toSet());
-        this.geyserSet =  base.getGeysers().stream().map(g -> g.getUnit()).collect(Collectors.toSet());
+        this.mineralSet = base.getMinerals().stream().map(m -> m.getUnit()).collect(Collectors.toList());
+        this.geyserSet =  base.getGeysers().stream().map(g -> g.getUnit()).collect(Collectors.toList());
         this.island = base.getArea().getAccessibleNeighbors().isEmpty();
         this.mineralOnly = !mineralSet.isEmpty() && geyserSet.isEmpty();
         this.startLocation = base.isStartingLocation();
@@ -54,12 +56,12 @@ public int gas() {
         return gas;
     }
 
-    public Set<Unit> getMinerals() {
-        return mineralSet;
+    public List<Unit> getMinerals() {
+        return new ArrayList<>(mineralSet);
     }
 
-    public Set<Unit> getGeysers() {
-        return geyserSet;
+    public List<Unit> getGeysers() {
+        return new ArrayList<>(geyserSet);
     }
 
     public double getGroundDistance(final BaseLocation other) {

src/main/java/bwta/Chokepoint.java

@@ -9,8 +9,8 @@
 
 
 public class Chokepoint {
-    private  ChokePoint chokePoint;
-    private  Pair<Position, Position> sides;
+    private ChokePoint chokePoint;
+    private Pair<Position, Position> sides;
     private Position center;
     private double width;
 

src/main/java/bwta/Region.java

@@ -3,6 +3,7 @@
 import bwapi.Position;
 import bwem.area.Area;
 
+import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -15,31 +16,30 @@ public class Region {
         this.center = area.getWalkPositionWithHighestAltitude().toPosition();
     }
 
-
     public Position getCenter() {
         return center;
     }
 
-    public Set<Chokepoint> getChokepoints() {
+    public List<Chokepoint> getChokepoints() {
         return area.getChokePoints().stream()
                 .map(c -> BWTA.chokeMap.get(c))
-                .collect(Collectors.toSet());
+                .collect(Collectors.toList());
     }
 
-    public Set<BaseLocation> getBaseLocations() {
+    public List<BaseLocation> getBaseLocations() {
         return area.getBases().stream()
                 .map(b -> BWTA.baseMap.get(b))
-                .collect(Collectors.toSet());
+                .collect(Collectors.toList());
     }
 
     public boolean isReachable(final Region region) {
         return area.isAccessibleFrom(region.area);
     }
 
-    public Set<Region> getReachableRegions() {
+    public List<Region> getReachableRegions() {
         return area.getAccessibleNeighbors().stream()
                 .map(a -> BWTA.regionMap.get(a))
-                .collect(Collectors.toSet());
+                .collect(Collectors.toList());
     }
 
     @Override