Fixed death handling: Spawn marines at bunker location

Bytekeeper · Bytekeeper · commit 210aa7390d52 · 2020-03-21T15:16:05.000+01:00
diff --git a/src/main/java/org/bk/ass/sim/Agent.java b/src/main/java/org/bk/ass/sim/Agent.java
@@ -7,11 +7,15 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 public class Agent {
-  static final BiConsumer<Agent, Collection<Agent>> CARRIER_DEATH_HANDLER =
-      (carrier, agents) -> agents.removeAll(carrier.interceptors);
+
+  static final Consumer<UnitDeathContext> CARRIER_DEATH_HANDLER =
+      context -> {
+        Agent carrier = context.deadUnit;
+        context.removeAgents(carrier.interceptors);
+      };
   // Retrieved from OpenBW
   private static final int STIM_TIMER = 37;
   private static final int STIM_HEALTH_COST_SHIFTED = 10 << 8;
@@ -100,7 +104,8 @@ public class Agent {
   List<Agent> interceptors = Collections.emptyList();
 
   // Allow replacement of units on death (for example bunker -> marines)
-  BiConsumer<Agent, Collection<Agent>> onDeathHandler = (ignored1, ignored2) -> {};
+  Consumer<UnitDeathContext> onDeathHandler = (ignored1) -> {
+  };
 
   public Agent(String name) {
     this.name = name;
@@ -419,7 +424,7 @@ public Agent setSize(UnitSize size) {
     return this;
   }
 
-  public Agent setOnDeathHandler(BiConsumer<Agent, Collection<Agent>> onDeathHandler) {
+  public Agent setOnDeathHandler(Consumer<UnitDeathContext> onDeathHandler) {
     this.onDeathHandler = onDeathHandler;
     return this;
   }
diff --git a/src/main/java/org/bk/ass/sim/BWAPI4JAgentFactory.java b/src/main/java/org/bk/ass/sim/BWAPI4JAgentFactory.java
@@ -2,9 +2,8 @@
 
 import static org.bk.ass.sim.Agent.CARRIER_DEATH_HANDLER;
 
-import java.util.Collection;
 import java.util.EnumSet;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import org.bk.ass.info.BWAPI4JUnitInfo;
 import org.openbw.bwapi4j.BWMap;
 import org.openbw.bwapi4j.Player;
@@ -34,13 +33,13 @@ public class BWAPI4JAgentFactory {
           UnitType.Terran_Marine, UnitType.Terran_Vulture,
           UnitType.Zerg_Mutalisk, UnitType.Protoss_Dragoon);
 
-  private BiConsumer<Agent, Collection<Agent>> bunkerDeathHandler =
-      (bunker, agents) -> {
-    // TODO: Fix collision map not being updated here
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
+  private final Consumer<UnitDeathContext> bunkerDeathHandler =
+      context -> {
+        Agent bunker = context.deadUnit;
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
       };
 
   private final BWMap map;
diff --git a/src/main/java/org/bk/ass/sim/Evaluator.java b/src/main/java/org/bk/ass/sim/Evaluator.java
@@ -25,6 +25,7 @@ public String toString() {
       };
   private final Parameters parameters;
   private SplittableRandom prng = new SplittableRandom();
+  private EvaluatorDeathContext deathContext = new EvaluatorDeathContext();
 
   public Evaluator(Parameters parameters) {
     this.parameters = parameters;
@@ -40,9 +41,17 @@ public Evaluator() {
    */
   public EvaluationResult evaluate(Collection<Agent> agentsA, Collection<Agent> agentsB) {
     List<Agent> finalAgentsA = new ArrayList<>();
-    agentsA.forEach(a -> a.onDeathHandler.accept(a, finalAgentsA));
+    deathContext.target = finalAgentsA;
+    agentsA.forEach(a -> {
+      deathContext.deadUnit = a;
+      a.onDeathHandler.accept(deathContext);
+    });
     List<Agent> finalAgentsB = new ArrayList<>();
-    agentsB.forEach(a -> a.onDeathHandler.accept(a, finalAgentsB));
+    deathContext.target = finalAgentsB;
+    agentsB.forEach(a -> {
+      deathContext.deadUnit = a;
+      a.onDeathHandler.accept(deathContext);
+    });
     finalAgentsA.addAll(agentsA);
     finalAgentsA.forEach(Agent::updateSpeed);
     finalAgentsB.addAll(agentsB);
@@ -296,6 +305,21 @@ public EvalWithAgents(double eval, List<Agent> agents) {
     }
   }
 
+  private static final class EvaluatorDeathContext extends UnitDeathContext {
+
+    Collection<Agent> target;
+
+    @Override
+    public void addAgent(Agent agent) {
+      target.add(agent);
+    }
+
+    @Override
+    public void removeAgents(List<Agent> agents) {
+      throw new UnsupportedOperationException();
+    }
+  }
+
   public static class Parameters {
 
     final double shieldScale;
diff --git a/src/main/java/org/bk/ass/sim/JBWAPIAgentFactory.java b/src/main/java/org/bk/ass/sim/JBWAPIAgentFactory.java
@@ -13,10 +13,9 @@
 import bwapi.UnitType;
 import bwapi.UpgradeType;
 import bwapi.WeaponType;
-import java.util.Collection;
 import java.util.EnumSet;
 import java.util.Set;
-import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import org.bk.ass.info.BWMirrorUnitInfo;
 
 /**
@@ -38,13 +37,13 @@ public class JBWAPIAgentFactory {
           UnitType.Zerg_Mutalisk,
           UnitType.Protoss_Dragoon);
 
-  private BiConsumer<Agent, Collection<Agent>> bunkerReplacer =
-      (bunker, agents) -> {
-        // TODO: Fix collision map not being updated here
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
-        agents.add(of(UnitType.Terran_Marine));
+  private Consumer<UnitDeathContext> bunkerReplacer =
+      context -> {
+        Agent bunker = context.deadUnit;
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
+        context.addAgent(of(UnitType.Terran_Marine).setX(bunker.x).setY(bunker.y));
       };
 
   private final Game game;
diff --git a/src/main/java/org/bk/ass/sim/Simulator.java b/src/main/java/org/bk/ass/sim/Simulator.java
@@ -2,6 +2,7 @@
 
 import java.util.Collection;
 import java.util.Collections;
+import java.util.List;
 import java.util.Objects;
 import java.util.function.ToIntFunction;
 import org.bk.ass.PositionOutOfBoundsException;
@@ -40,6 +41,7 @@ public class Simulator {
   private final Behavior playerABehavior;
   private final Behavior playerBBehavior;
   private final int frameSkip;
+  private final SimulatorDeathContext deathContext = new SimulatorDeathContext();
 
   private Simulator(int frameSkip, Behavior playerABehavior, Behavior playerBBehavior) {
     if (frameSkip < 1) throw new IllegalArgumentException("frameSkip must be >= 1");
@@ -216,8 +218,12 @@ private void removeDead(UnorderedCollection<Agent> agents) {
     while (i < agents.size()) {
       if (agents.get(i).healthShifted < 1) {
         Agent agent = agents.removeAt(i);
-        if (!agent.isFlyer) collision[colindex(agent.x, agent.y)]--;
-        agent.onDeathHandler.accept(agent, agents);
+        if (!agent.isFlyer) {
+          collision[colindex(agent.x, agent.y)]--;
+        }
+        deathContext.deadUnit = agent;
+        deathContext.myUnits = agents;
+        agent.onDeathHandler.accept(deathContext);
       } else {
         i++;
       }
@@ -369,4 +375,42 @@ public Simulator build() {
       return new Simulator(frameSkip, playerABehavior, playerBBehavior);
     }
   }
+
+  /**
+   * Context for death handlers
+   */
+  public final class SimulatorDeathContext extends UnitDeathContext {
+
+    Collection<Agent> myUnits;
+
+    public Collection<Agent> getMyUnits() {
+      return myUnits;
+    }
+
+    /**
+     * Adds the given agent to "our" agents. <em>Do not modify the position after adding it
+     * here!</em>
+     */
+    @Override
+    public void addAgent(Agent agent) {
+      agent.x = agent.nx;
+      agent.y = agent.ny;
+      myUnits.add(agent);
+      checkBounds(agent);
+      if (!agent.isFlyer) {
+        collision[colindex(agent.x, agent.y)]++;
+      }
+    }
+
+    @Override
+    public void removeAgents(List<Agent> agents) {
+      for (int i = 0; i < agents.size(); i++) {
+        Agent a = agents.get(i);
+        if (!a.isFlyer) {
+          collision[colindex(a.x, a.y)]--;
+        }
+        myUnits.remove(a);
+      }
+    }
+  }
 }
diff --git a/src/main/java/org/bk/ass/sim/UnitDeathContext.java b/src/main/java/org/bk/ass/sim/UnitDeathContext.java
@@ -0,0 +1,17 @@
+package org.bk.ass.sim;
+
+import java.util.List;
+
+public abstract class UnitDeathContext {
+
+  Agent deadUnit;
+
+  public Agent getDeadUnit() {
+    return deadUnit;
+  }
+
+
+  abstract void addAgent(Agent agent);
+
+  public abstract void removeAgents(List<Agent> agents);
+}
diff --git a/src/test/java/org/bk/ass/sim/SimulatorTest.java b/src/test/java/org/bk/ass/sim/SimulatorTest.java
@@ -471,9 +471,9 @@ void _6MutaVs1BunkerAnd4SCVs() {
   void _5MutaVs1Bunker() {
     // GIVEN
     for (int i = 0; i < 5; i++) {
-      simulator.addAgentA(factory.of(UnitType.Zerg_Mutalisk));
+      simulator.addAgentA(factory.of(UnitType.Zerg_Mutalisk).setX(1000));
     }
-    simulator.addAgentB(factory.of(UnitType.Terran_Bunker));
+    simulator.addAgentB(factory.of(UnitType.Terran_Bunker).setX(1100));
 
     // WHEN
     simulator.simulate(-1);
