compeltes search for closest creek

2AA4-W24 · Mar 25, 2024 · ddb234e · ddb234e
1 parent 1279808
commit ddb234e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 19 deletions.
diff --git a/src/main/java/ca/mcmaster/se2aa4/island/team101/AreaMap.java b/src/main/java/ca/mcmaster/se2aa4/island/team101/AreaMap.java
@@ -1,9 +1,9 @@
 package ca.mcmaster.se2aa4.island.team101;
 import java.lang.Math;
 import java.util.List; 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.ArrayList;
 import java.awt.Point;
 import java.util.Arrays;
 import org.apache.logging.log4j.LogManager;
@@ -25,33 +25,46 @@ public void updateMap(Point currentPosition, Response response, Command latestCo
         if(type.equals("scan")){
             ScanResponse scanResponse = (ScanResponse)response;
             Tile tile = new Tile();
+            Point p = new Point(currentPosition.x, currentPosition.y);
+            // need to make new point otherwise code breaks
             tile.fillTile((ScanResponse)response);
             if ((scanResponse.getCreeks().length()) > 0){
                 logger.info(tile.getCreekID() + "creek id" + currentPosition);
-                creekMap.put(currentPosition, tile.getCreekID());
+                creekMap.put(p, tile.getCreekID());
                 logger.info((Arrays.asList(creekMap)) + "creekmap");
             }
             if (tile.getSiteID() != null){
-                logger.info(tile.getSiteID() + "site id" + currentPosition);
-                emergencyPoint = currentPosition;
+                logger.info(tile.getSiteID() + "site id" + p);
+                emergencyPoint = p;
             }
         }
     }
 
     public String findClosestCreek(){
-        logger.info((Arrays.asList(creekMap)));
 
-        for (Point p : creekMap.keySet()){
-            logger.info(p + "point of creek");
-        }
         Point closestInlet = new Point(0,0);
-        double minDist = 100000, distx, disty, calc_dist;
+        double minDist = Integer.MAX_VALUE, distx, disty, calc_dist;
         if (emergencyPoint == null){
-            return "nothing";
+            List<String> valuesList = new ArrayList<String>(creekMap.values());
+            return valuesList.get(0);
         }
+        for (HashMap.Entry<Point, String> entry : creekMap.entrySet()){
+            Point key = entry.getKey();
+            String id = entry.getValue();
+
+
+            distx = emergencyPoint.getX() - key.getX();
+            disty = emergencyPoint.getY() - key.getY();
+            calc_dist = Math.pow((Math.pow(distx, 2) + Math.pow(disty, 2)), 0.5);
 
+            if (calc_dist <= minDist){
+                minDist = calc_dist;
+                closestInlet = key;
+            }
+
+        }
         // find the closest creek using the creekmap
         // case where no closest creek is found is NOT ACCOUNTED FOR (i.e. closestInlet is null)
-        return creekMap.get(0);
+        return creekMap.get(closestInlet);
     }
 }
diff --git a/src/main/java/ca/mcmaster/se2aa4/island/team101/Drone.java b/src/main/java/ca/mcmaster/se2aa4/island/team101/Drone.java
@@ -9,7 +9,7 @@ public class Drone implements Traveler{
     private AreaMap map;
     private Response latestResponse;  
     private Compass compass;
-    private DroneController controller;
+    private Controller controller;
     private Command latestCommand;
 
     private final Logger logger = LogManager.getLogger();

diff --git a/src/main/java/ca/mcmaster/se2aa4/island/team101/Explorer.java b/src/main/java/ca/mcmaster/se2aa4/island/team101/Explorer.java
@@ -40,9 +40,8 @@ public void acknowledgeResults(String s) {
 
     @Override
     public String deliverFinalReport() {
-        logger.info("final");
         String closest = drone.getClosestCreek();
-        logger.info(closest + "final");
+        logger.info(closest);
         return closest;
     }
 

diff --git a/src/main/java/ca/mcmaster/se2aa4/island/team101/ScanResponse.java b/src/main/java/ca/mcmaster/se2aa4/island/team101/ScanResponse.java
@@ -17,11 +17,6 @@ public ScanResponse(int cost, JSONObject extras, String status){
         this.sites = extras.optJSONArray("sites");
     }
 
-    @Override
-    public int getCost(){
-        return this.cost;
-    }
-
     public JSONArray getBiomes(){
         return this.biomes;
     }