diff --git a/23.2.jar b/23.2.jar new file mode 100644 index 0000000..d848598 Binary files /dev/null and b/23.2.jar differ diff --git a/core/src/MyStrategy.java b/core/src/MyStrategy.java index 6047577..7050ec1 100755 --- a/core/src/MyStrategy.java +++ b/core/src/MyStrategy.java @@ -1509,23 +1509,22 @@ private void schedulePotentialMoveToPoint(VehicleGroupInfo myGroup) { } for (int x = myX - half; x <= myX + half; x++) { for (int y = myY - half; y <= myY + half; y++) { - if (y == myY && x == myX) { - continue; - } Point2D currentChoice = new Point2D(x, y); if (Math.ceil(currentChoice.getDistanceTo(myX, myY)) > half + 0.01) { continue; } currentChoice.setVal(myGroup.potentialMap.get(x, y)); - if (bestChoice == null || bestChoice.getVal() < currentChoice.getVal()) { - //TODO check safety - bestChoice = currentChoice; + if (true) { + if (bestChoice == null || bestChoice.getVal() < currentChoice.getVal()) { + //TODO check safety + bestChoice = currentChoice; + } } } } - if (bestChoice != null) { + if (bestChoice != null && !bestChoice.equals(new Point2D(myX, myY))) { scheduleSelectAll(myGroup); actualMoveToPoint(myGroup, bestChoice.mul(cellSize).add(cellSize / 2, cellSize / 2), move); //TODO scale\rotate when needed } else { diff --git a/core/src/Runner.java b/core/src/Runner.java index e058223..32f912f 100755 --- a/core/src/Runner.java +++ b/core/src/Runner.java @@ -41,7 +41,8 @@ public static void main(String[] args) throws IOException { //runProc(null, true, "java", "-cp", "22.jar", "Runner"); //runProc(null, true, "java", "-cp", "22.3.jar", "Runner"); //runProc(null, true, "java", "-cp", "22.5.jar", "Runner"); - runProc(null, true, "java", "-cp", "23.jar", "Runner"); + //runProc(null, true, "java", "-cp", "23.jar", "Runner"); + runProc(null, true, "java", "-cp", "23.2.jar", "Runner"); } }).start(); new Runner(new String[]{"127.0.0.1", hasArgs ? "31001" : "31002", "0000000000000000"}).run();