Get list of closes places was added

src/Task9.java

@@ -18,7 +18,11 @@ public class Task9 {
       System.out.println(node.getLatitude() + "," +  node.getLongitude());
     }*/
     g.loadInterestPoints("interessepktIceland.txt");
-    g.printInterestPoints();
+    Map<Integer,Integer> list = Dijkstra.getListOfPlaces(g,0,8,(short) 2).getPlaceList();
+    list.forEach((number, integer) -> {
+      Node node = g.getNode(number);
+      System.out.println(node.getName() +" : "+node.getLatitude()+","+node.getLongitude()+" Driving time: " + integer );
+    });
   }
 }
 class Node{
@@ -162,9 +166,7 @@ class Graph{
     List<String> data = Utils.readFile(inFile);
     for (int i = 1; i < data.size(); ++i) {
       String[] splitText = Utils.dividedText(data.get(i), 3);
-      Node node = getNode(Integer.parseInt(splitText[0]));
-      node.setType(Short.parseShort(splitText[1]));
-      node.setName(splitText[2]);
+      this.setTypes(Integer.parseInt(splitText[0]),Short.parseShort(splitText[1]),splitText[2]);
     }
     System.out.println("Interest points loaded.");
   }
@@ -182,7 +184,7 @@ class Graph{
     System.out.println(sb.toString());
   }
 
-  private void setTypes(int nodeNumber,int typeValue, String name){
+  private void setTypes(int nodeNumber,short typeValue, String name){
     Node node = this.getNode(nodeNumber);
 
     if((typeValue&1) ==1) node.setType((short) 1);
@@ -257,7 +259,7 @@ class Dijkstra{
         Node node = graph.getNode(nextNode);
         if (node.getName() != null){
           if(node.isTypeOf(type)){
-            listOfPlaces.addPlace(node,currentSum);
+            listOfPlaces.addPlace(node.getNumber(),currentSum);
           }
         }
       }
@@ -328,42 +330,46 @@ class Dijkstra{
 }
 
 class ListOfPlaces{
-  private final Map<Node, Integer> placeList = new HashMap<>();
+  private final Map<Integer, Integer> placeList = new HashMap<>();
   int maxDriveTime = 0;
   private final int maxSize;
+  int numberOfFarthestNode = -1;
 
   public ListOfPlaces(int maxSize){
     this.maxSize = maxSize;
   }
 
-  public void addPlace(Node node, int driveTime){
+  public void addPlace(int nodeNumber, int driveTime){
     if(placeList.size()<this.maxSize){
-      placeList.put(node,driveTime);
-      if(driveTime> this.maxDriveTime) this.maxDriveTime = driveTime;
+      placeList.put(nodeNumber,driveTime);
+      if(driveTime> this.maxDriveTime){
+        this.maxDriveTime = driveTime;
+        this.numberOfFarthestNode = nodeNumber;
+      }
     }
     else{
-      fixPlaceList(node,driveTime);
+      fixPlaceList(nodeNumber,driveTime);
     }
   }
 
-  private void fixPlaceList(Node node, int driveTime){
-    if (placeList.containsKey(node) && placeList.get(node)<driveTime){
-      placeList.put(node,driveTime);
+  private void fixPlaceList(int nodeNumber, int driveTime){
+    if (placeList.containsKey(nodeNumber) && placeList.get(nodeNumber)<driveTime){
+      placeList.replace(nodeNumber,driveTime);
     }
-    else{
-      Node testNode;
-      int testDriveTime;
-      Node[] nodeList = (Node[]) placeList.keySet().toArray();
-      for(int i = 0; i<maxSize;i++){
-        if(placeList.get(nodeList[i])<driveTime){
-          testNode = nodeList[i];
-          testDriveTime = placeList.get(nodeList[i]);
-          placeList.remove(testNode);
-          placeList.put(node,driveTime);
-          fixPlaceList(testNode,testDriveTime);
+    else if(driveTime<maxDriveTime){
+      placeList.remove(numberOfFarthestNode);
+      placeList.put(nodeNumber,driveTime);
+      int max = 0;
+      placeList.forEach((integer, integer2) -> {
+        if(integer2>max){
+          maxDriveTime=integer2;
+          numberOfFarthestNode =integer;
         }
+      });
     }
   }
+  public Map<Integer,Integer> getPlaceList(){
+    return placeList;
   }
 }