Small performance improvements.

Author: Bytekeeper

src/main/java/org/bk/ass/sim/Agent.java

@@ -7,10 +7,14 @@
 import java.util.function.BiConsumer;
 
 import static java.lang.Math.max;
+import static java.lang.Math.min;
 
 public class Agent {
   static final BiConsumer<Agent, Collection<Agent>> CARRIER_DEATH_HANDLER =
       (carrier, agents) -> agents.removeAll(carrier.interceptors);
+  // Retrieved from OpenBW
+  private static final int STIM_TIMER = 37;
+  private static final int STIM_ENERGY_COST_SHIFTED = 10 << 8;
 
   private final String name;
   TargetingPriority attackTargetPriority = TargetingPriority.HIGHEST;
@@ -89,10 +93,11 @@ public Agent(String name) {
 
   /**
    * Copy constructor. References to other agents are cleared:
+   *
    * <ul>
-   *     <li>attackTarget</li>
-   *     <li>restoreTarget</li>
-   *     <li>interceptors</li>
+   *   <li>attackTarget
+   *   <li>restoreTarget
+   *   <li>interceptors
    * </ul>
    */
   public Agent(Agent other) {
@@ -255,7 +260,7 @@ public Agent setHealth(int health) {
   }
 
   public int getHealth() {
-    return healthShifted >> 8;
+    return min(healthShifted, maxHealthShifted) >> 8;
   }
 
   public Agent setMaxHealth(int maxHealth) {
@@ -269,7 +274,7 @@ public Agent setShields(int shields) {
   }
 
   public int getShields() {
-    return shieldsShifted >> 8;
+    return min(shieldsShifted, maxShieldsShifted) >> 8;
   }
 
   public Agent setMaxShields(int maxShields) {
@@ -402,6 +407,23 @@ public Agent setPlagueDamage(int plagueDamage) {
     return this;
   }
 
+  public final void consumeEnergy(int amountShifted) {
+    energyShifted = min(energyShifted, maxEnergyShifted) - amountShifted;
+  }
+
+  public final void consumeHealth(int amountShifted) {
+    healthShifted = min(healthShifted, maxHealthShifted) - amountShifted;
+  }
+
+  public final void heal(int amountShifted) {
+    healthShifted += amountShifted;
+  }
+
+  public final void stim() {
+    remainingStimFrames = STIM_TIMER;
+    consumeHealth(STIM_ENERGY_COST_SHIFTED);
+  }
+
   public enum TargetingPriority {
     LOW,
     MEDIUM,

src/main/java/org/bk/ass/sim/AgentUtil.java

@@ -10,8 +10,6 @@ public class AgentUtil {
   private static final SplittableRandom rnd = new SplittableRandom();
 
   // Retrieved from OpenBW
-  private static final int STIM_TIMER = 37;
-  private static final int STIM_ENERGY_COST_SHIFTED = 10 << 8;
   public static final int INTERCEPTOR_COOLDOWN = 45;
   public static final int REAVER_COOLDOWN = 60;
 
@@ -160,7 +158,7 @@ public static void dealDamage(Agent agent, Weapon wpn, Agent target) {
   }
 
   private static void applyDamage(Agent target, DamageType damageType, int damage, int hits) {
-    int shields = target.shieldsShifted - damage + target.shieldUpgrades;
+    int shields = min(target.maxShieldsShifted, target.shieldsShifted) - damage + target.shieldUpgrades;
     if (shields > 0) {
       target.shieldsShifted = shields;
       return;
@@ -176,7 +174,7 @@ private static void applyDamage(Agent target, DamageType damageType, int damage,
         reduceDamageByTargetSizeAndDamageType(
             target, damageType, damage - target.armorShifted * hits);
 
-    target.healthShifted -= max(128, damage);
+    target.consumeHealth(max(128, damage));
   }
 
   public static int reduceDamageByTargetSizeAndDamageType(
@@ -196,9 +194,4 @@ public static int reduceDamageByTargetSizeAndDamageType(
     }
     return damageShifted;
   }
-
-  public static void stim(Agent agent) {
-    agent.remainingStimFrames = STIM_TIMER;
-    agent.healthShifted -= STIM_ENERGY_COST_SHIFTED;
-  }
 }

src/main/java/org/bk/ass/sim/AttackerBehavior.java

@@ -11,7 +11,10 @@ public class AttackerBehavior implements Behavior {
 
   @Override
   public boolean simUnit(
-          int frameSkip, Agent agent, UnorderedCollection<Agent> allies, UnorderedCollection<Agent> enemies) {
+      int frameSkip,
+      Agent agent,
+      UnorderedCollection<Agent> allies,
+      UnorderedCollection<Agent> enemies) {
     if (agent.cooldown > agent.maxCooldown - agent.stopFrames) {
       return true;
     }
@@ -90,7 +93,7 @@ private void simAttack(
     if (agent.canStim
         && agent.remainingStimFrames <= 0
         && agent.healthShifted >= agent.maxHealthShifted / 2) {
-      AgentUtil.stim(agent);
+      agent.stim();
     }
     dealDamage(agent, selectedWeapon, selectedEnemy);
     switch (selectedWeapon.splashType) {
@@ -116,7 +119,11 @@ private void simAttack(
   }
 
   private void simCombatMove(
-          int frameSkip, Agent agent, Agent selectedEnemy, int selectedDistanceSquared, Weapon selectedWeapon) {
+      int frameSkip,
+      Agent agent,
+      Agent selectedEnemy,
+      int selectedDistanceSquared,
+      Weapon selectedWeapon) {
     boolean shouldKite =
         agent.isKiter
             && agent.cooldown > 0

src/main/java/org/bk/ass/sim/HealerBehavior.java

@@ -3,7 +3,6 @@
 import org.bk.ass.collection.UnorderedCollection;
 import org.bk.ass.sim.Simulator.Behavior;
 
-import static java.lang.Math.min;
 import static org.bk.ass.sim.AgentUtil.distanceSquared;
 import static org.bk.ass.sim.AgentUtil.moveToward;
 
@@ -63,10 +62,9 @@ public boolean simUnit(
     if (selectedDistanceSquared > MEDICS_HEAL_RANGE_SQUARED) {
       return true;
     }
-    agent.energyShifted -= 256 * frameSkip;
+    agent.consumeEnergy(256 * frameSkip);
     selectedAlly.healedThisFrame = true;
-    selectedAlly.healthShifted = min(selectedAlly.maxHealthShifted, selectedAlly.healthShifted + 150 * frameSkip);
-
+    selectedAlly.heal(150 * frameSkip);
     return true;
   }
 }

src/main/java/org/bk/ass/sim/RepairerBehavior.java

@@ -3,7 +3,6 @@
 import org.bk.ass.collection.UnorderedCollection;
 import org.bk.ass.sim.Simulator.Behavior;
 
-import static java.lang.Math.min;
 import static java.lang.Math.sqrt;
 import static org.bk.ass.sim.AgentUtil.distanceSquared;
 import static org.bk.ass.sim.AgentUtil.moveToward;
@@ -58,7 +57,7 @@ public boolean simUnit(
     if (selectedDistanceSquared > SCV_REPAIR_RANGE_SQUARED) {
       return true;
     }
-    selectedAlly.healthShifted = min(selectedAlly.maxHealthShifted, selectedAlly.healthShifted + selectedAlly.hpConstructionRate * frameSkip);
+    selectedAlly.heal(selectedAlly.hpConstructionRate * frameSkip);
 
     return true;
   }

src/main/java/org/bk/ass/sim/Simulator.java

@@ -8,8 +8,6 @@
 import java.util.Objects;
 import java.util.function.ToIntFunction;
 
-import static java.lang.Math.min;
-
 /**
  * Used to simulate 2 groups of agents engaging each other. Either use the default constructor which
  * initialized the default behavior or customize the behaviors. Ie. if you want to simulate one
@@ -221,14 +219,16 @@ private void updateStats(UnorderedCollection<Agent> agents) {
       agent.vy = 0;
       agent.healedThisFrame = false;
 
-      agent.cooldown = agent.cooldown - frameSkip;
-      agent.shieldsShifted = min(agent.maxShieldsShifted, agent.shieldsShifted + 7 * frameSkip);
+      // Since these calls are potentially made every frame, no boundary checks are done!
+      // Bounds are established when the fields are modified.
+      agent.cooldown -= frameSkip;
+      agent.shieldsShifted += 7 * frameSkip;
       if (agent.plagueDamagePerFrameShifted * frameSkip < agent.healthShifted)
         agent.healthShifted -= agent.plagueDamagePerFrameShifted * frameSkip;
-      agent.remainingStimFrames = agent.remainingStimFrames - frameSkip;
+      agent.remainingStimFrames -= frameSkip;
       if (agent.regeneratesHealth)
-        agent.healthShifted = min(agent.maxHealthShifted, agent.healthShifted + 4 * frameSkip);
-      agent.energyShifted = min(agent.energyShifted + 8 * frameSkip, agent.maxEnergyShifted);
+        agent.healthShifted += 4 * frameSkip;
+      agent.energyShifted += 8 * frameSkip;
     }
   }