Small improvement to prevent sqrt twice for kiting units (and using double for one)

Author: Bytekeeper

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

@@ -14,24 +14,22 @@ private AgentUtil() {
     // Utility class
   }
 
-  public static void moveToward(Agent agent, Agent target, int distanceSquared) {
-    if (distanceSquared <= agent.speedSquared) {
+  public static void moveToward(Agent agent, Agent target, float distance) {
+    if (distance <= agent.speed) {
       agent.vx = target.x - agent.x;
       agent.vy = target.y - agent.y;
     } else {
-      float distance = (float) sqrt(distanceSquared);
       agent.vx = (int) ((target.x - agent.x) * agent.speed / distance);
       agent.vy = (int) ((target.y - agent.y) * agent.speed / distance);
     }
   }
 
-  public static void moveAwayFrom(Agent agent, Agent target, int distanceSquared) {
-    if (distanceSquared == 0) {
+  public static void moveAwayFrom(Agent agent, Agent target, float distance) {
+    if (distance == 0) {
       double a = rnd.nextDouble(Math.PI * 2);
       agent.vx = (int) (cos(a) * agent.speed);
       agent.vy = (int) (sin(a) * agent.speed);
     } else {
-      float distance = (float) sqrt(distanceSquared);
       agent.vx = (int) ((agent.x - target.x) * agent.speed / distance);
       agent.vy = (int) ((agent.y - target.y) * agent.speed / distance);
     }

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

@@ -46,10 +46,10 @@ public boolean simUnit(
             && enemy.detected
             && !enemy.isStasised
             && prioCmp >= 0) {
-          int distanceSquared = distanceSquared(agent, enemy);
-          if (distanceSquared >= wpn.minRangeSquared
-              && (distanceSquared < selectedDistanceSquared || prioCmp > 0)) {
-            selectedDistanceSquared = distanceSquared;
+          int distanceSq = distanceSquared(agent, enemy);
+          if (distanceSq >= wpn.minRangeSquared
+              && (distanceSq < selectedDistanceSquared || prioCmp > 0)) {
+            selectedDistanceSquared = distanceSq;
             selectedEnemy = enemy;
             selectedWeapon = wpn;
 
@@ -127,13 +127,13 @@ private void simCombatMove(
             && agent.cooldown > 0
             && selectedEnemy.weaponVs(agent).minRangeSquared <= selectedDistanceSquared
             && selectedEnemy.speed < agent.speed;
+    float distance = (float) sqrt(selectedDistanceSquared);
     if (shouldKite) {
-      double distance = sqrt(selectedDistanceSquared);
       if (distance + agent.speed < selectedWeapon.maxRange) {
-        moveAwayFrom(agent, selectedEnemy, selectedDistanceSquared);
+        moveAwayFrom(agent, selectedEnemy, distance);
       }
     } else {
-      moveToward(agent, selectedEnemy, selectedDistanceSquared);
+      moveToward(agent, selectedEnemy, distance);
     }
   }
 }

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

@@ -39,9 +39,9 @@ public boolean simUnit(
             && !agent.healedThisFrame
             && ally != agent) {
 
-          int distance = distanceSquared(agent, ally);
-          if (distance < selectedDistanceSquared) {
-            selectedDistanceSquared = distance;
+          int distanceSq = distanceSquared(agent, ally);
+          if (distanceSq < selectedDistanceSquared) {
+            selectedDistanceSquared = distanceSq;
             selectedAlly = ally;
 
             // If we can heal it this frame, we're done searching
@@ -58,7 +58,7 @@ public boolean simUnit(
       return false;
     }
 
-    moveToward(agent, selectedAlly, selectedDistanceSquared);
+    moveToward(agent, selectedAlly, (float) Math.sqrt(selectedDistanceSquared));
     if (selectedDistanceSquared > MEDICS_HEAL_RANGE_SQUARED) {
       return true;
     }

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

@@ -3,6 +3,7 @@
 import org.bk.ass.Simulator.Behavior;
 import org.bk.ass.collection.UnorderedCollection;
 
+import static java.lang.Math.sqrt;
 import static org.bk.ass.AgentUtil.distanceSquared;
 import static org.bk.ass.AgentUtil.moveToward;
 
@@ -33,9 +34,9 @@ public boolean simUnit(
             && ally.healthShifted < ally.maxHealthShifted
             && ally != agent) {
 
-          int distance = distanceSquared(agent, ally);
-          if (distance < selectedDistanceSquared) {
-            selectedDistanceSquared = distance;
+          int distanceSq = distanceSquared(agent, ally);
+          if (distanceSq < selectedDistanceSquared) {
+            selectedDistanceSquared = distanceSq;
             selectedAlly = ally;
 
             // If we can repair it this frame, we're done searching
@@ -52,7 +53,7 @@ public boolean simUnit(
       return false;
     }
 
-    moveToward(agent, selectedAlly, selectedDistanceSquared);
+    moveToward(agent, selectedAlly, (float) sqrt(selectedDistanceSquared));
     if (selectedDistanceSquared > SCV_REPAIR_RANGE_SQUARED) {
       return true;
     }

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

@@ -3,6 +3,7 @@
 import org.bk.ass.Simulator.Behavior;
 import org.bk.ass.collection.UnorderedCollection;
 
+import static java.lang.Math.sqrt;
 import static org.bk.ass.AgentUtil.distanceSquared;
 import static org.bk.ass.AgentUtil.moveAwayFrom;
 
@@ -22,9 +23,9 @@ static boolean simFlee(Agent agent, UnorderedCollection<Agent> enemies) {
       Agent enemy = enemies.get(i);
       Weapon wpn = enemy.weaponVs(agent);
       if (wpn.damageShifted != 0) {
-        int distance = distanceSquared(agent, enemy);
-        if (distance >= wpn.minRangeSquared && distance < selectedDistanceSquared) {
-          selectedDistanceSquared = distance;
+        int distanceSq = distanceSquared(agent, enemy);
+        if (distanceSq >= wpn.minRangeSquared && distanceSq < selectedDistanceSquared) {
+          selectedDistanceSquared = distanceSq;
           selectedEnemy = enemy;
 
           // If we can hit it this frame, we're done searching
@@ -37,7 +38,7 @@ static boolean simFlee(Agent agent, UnorderedCollection<Agent> enemies) {
     if (selectedEnemy == null) {
       return false;
     }
-    moveAwayFrom(agent, selectedEnemy, selectedDistanceSquared);
+    moveAwayFrom(agent, selectedEnemy, (float) sqrt(selectedDistanceSquared));
     return true;
   }
 }