- proper facility switch

Karloid · Dec 16, 2017 · e2df807 · e2df807
1 parent e861cff
commit e2df807
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/core/src/MyStrategy.java b/core/src/MyStrategy.java
@@ -1011,7 +1011,17 @@ private void switchGoToFacility(VehicleGroupInfo myGroup) {
                     Point2D otherAp = other.getAveragePoint();
                     FacilityWrapper otherF = other.goToFacility;
 
-                    boolean f1 = otherAp.getDistanceTo(otherF) > otherAp.getDistanceTo(myF);
+
+                    double distanceTo = otherAp.getDistanceTo(otherF);
+                    if (distanceTo == 0) {
+                        distanceTo = 1;
+                    }
+                    if (myAp.getDistanceTo(otherF) / distanceTo < 0.78 && distanceTo > 64) {
+                        myGroup.goToFacility = other.goToFacility;
+                        other.goToFacility = null; //TODO mb do not reset
+                    }
+
+                   /* boolean f1 = otherAp.getDistanceTo(otherF) > otherAp.getDistanceTo(myF);
                     boolean f2 = myAp.getDistanceTo(myF) > myAp.getDistanceTo(otherAp);
 
                     double currentDistance = myAp.getDistanceTo(myF) + otherAp.getDistanceTo(otherF);
@@ -1023,7 +1033,7 @@ private void switchGoToFacility(VehicleGroupInfo myGroup) {
                         other.goToFacility = myF;
                         other.switchCount++;
                         myGroup.switchCount++;
-                    }
+                    }*/
                 }
             }
         }
@@ -1964,7 +1974,7 @@ private List<VehicleGroupInfo> getGroups(Ownership ownership) {
             }
 
             for (Map.Entry<VehicleGroupInfo, FacilityWrapper> e : bestSetup.map.entrySet()) {
-                 e.getKey().goToFacility = e.getValue();
+                e.getKey().goToFacility = e.getValue();
             }
         }