22.5 --

Karloid · Dec 14, 2017 · d98f7e7 · d98f7e7
1 parent aef44f9
commit d98f7e7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/22.5.jar b/22.5.jar
diff --git a/core/src/MyStrategy.java b/core/src/MyStrategy.java
@@ -356,13 +356,19 @@ private PlainArray calcMap(VehicleGroupInfo group) { //TODO improve logic at fin
                     if (myArrvs.isEmpty()) {
                         addToArrayNotOurFacilities(plainArray, range, 1, group);
                     } else {
-                        HashSet<Map.Entry<Point2D, Integer>> entries = new HashSet<>(myArrvs);
-                        for (Map.Entry<Point2D, Integer> en : entries) {
-                            en.setValue(1);
+                        VehicleGroupInfo maxArrvG = myGroups.stream().filter(g -> g.vehicleType == ARRV).max(Comparator.comparingInt(g -> g.vehicles.size())).orElse(null);
+
+                        HashSet<Map.Entry<Point2D, Integer>> entries = new HashSet<>();
+                        if (maxArrvG != null) {
+                            entries.add(new AbstractMap.SimpleEntry<>(maxArrvG.getCellAveragePoint(), 1));
+                        } else {
+                            entries.addAll(myArrvs);
+                            for (Map.Entry<Point2D, Integer> en : entries) {
+                                en.setValue(1);
+                            }
                         }
-                        //TODO go to single point
+                        addToArray(plainArray, entries, range, .1f);
 
-                        addToArray(plainArray, myArrvs, range, .1f);
                     }
 
                 } else {
@@ -451,12 +457,18 @@ private PlainArray calcMap(VehicleGroupInfo group) { //TODO improve logic at fin
                     if (myIfvs.isEmpty()) {
                         addToArrayNotOurFacilities(plainArray, range, 1, group);
                     } else {
-                        HashSet<Map.Entry<Point2D, Integer>> entries = new HashSet<>(myIfvs);
-                        for (Map.Entry<Point2D, Integer> en : entries) {
-                            en.setValue(1);
+                        VehicleGroupInfo maxIfvG = myGroups.stream().filter(g -> g.vehicleType == IFV).max(Comparator.comparingInt(g -> g.vehicles.size())).orElse(null);
+
+                        HashSet<Map.Entry<Point2D, Integer>> entries = new HashSet<>();
+                        if (maxIfvG != null) {
+                            entries.add(new AbstractMap.SimpleEntry<>(maxIfvG.getCellAveragePoint(), 1));
+                        } else {
+                            entries.addAll(myIfvs);
+                            for (Map.Entry<Point2D, Integer> en : entries) {
+                                en.setValue(1);
+                            }
                         }
-                        //TODO go to single point
-                        addToArray(plainArray, myIfvs, range, .1f);
+                        addToArray(plainArray, entries, range, .1f);
                     }
                 }
 
@@ -873,7 +885,7 @@ private void addToArrayNotOurFacilities(PlainArray plainArray, double range, flo
             addToArray(plainArray, fc.get(-1L).get(VEHICLE_FACTORY).entrySet(), range, factor);
         } else {
             HashSet<Map.Entry<Point2D, Integer>> counts = new HashSet<>();
-            counts.add(new AbstractMap.SimpleEntry<Point2D, Integer>(group.goToFacility.getCenterCellPos(), 1));
+            counts.add(new AbstractMap.SimpleEntry<>(group.goToFacility.getCenterCellPos(), 1));
             addToArray(plainArray, counts, range, factor);
         }
     }

diff --git a/core/src/Runner.java b/core/src/Runner.java
@@ -39,7 +39,8 @@ public static void main(String[] args) throws IOException {
                 //runProc(null, true, "java", "-cp", "19.jar", "Runner");
                 //runProc(null, true, "java", "-cp", "21.jar", "Runner");
                 //runProc(null, true, "java", "-cp", "22.jar", "Runner");
-                runProc(null, true, "java", "-cp", "22.3.jar", "Runner");
+                //runProc(null, true, "java", "-cp", "22.3.jar", "Runner");
+                runProc(null, true, "java", "-cp", "22.4.jar", "Runner");
             }
         }).start();
         new Runner(new String[]{"127.0.0.1", hasArgs ? "31001" : "31002", "0000000000000000"}).run();