diff --git a/out/production/Real Task 9/ALTGraph.class b/out/production/Real Task 9/ALTGraph.class index 7576cf8ad9e74efdd778b196ef3fae262dd6e579..45d937cc379efd137d700a65acd92b3315a0b87a 100644 Binary files a/out/production/Real Task 9/ALTGraph.class and b/out/production/Real Task 9/ALTGraph.class differ diff --git a/out/production/Real Task 9/Comparators$AltComparator.class b/out/production/Real Task 9/Comparators$AltComparator.class new file mode 100644 index 0000000000000000000000000000000000000000..db51ddb8215477d1e1f2b8161b3338dc8d10e03f Binary files /dev/null and b/out/production/Real Task 9/Comparators$AltComparator.class differ diff --git a/out/production/Real Task 9/Comparators.class b/out/production/Real Task 9/Comparators.class index 00fc4d200a626ddd671ee1b7a70a0a96db58c6ee..4d0a10a41277e7487dacb7e4c4299ea49499039d 100644 Binary files a/out/production/Real Task 9/Comparators.class and b/out/production/Real Task 9/Comparators.class differ diff --git a/out/production/Real Task 9/Graph.class b/out/production/Real Task 9/Graph.class index a2423f835c0feefdb94c135665d7d6a634ce19e0..9a481943f7d0e127b9212ab4d194fd1f363ef25e 100644 Binary files a/out/production/Real Task 9/Graph.class and b/out/production/Real Task 9/Graph.class differ diff --git a/out/production/Real Task 9/Main.class b/out/production/Real Task 9/Main.class index a5de5ad351464b7e85fb34effd9c790eae6e8690..2439f6d8b1bf160affa3e06b8dadc27131fc5733 100644 Binary files a/out/production/Real Task 9/Main.class and b/out/production/Real Task 9/Main.class differ diff --git a/src/Graph.java b/src/Graph.java index 067dce4d6911a4a5336a61075bb18cb3c080b5fb..b421f9d7f914c90abeecc47d010d34ee8ec2b1d8 100644 --- a/src/Graph.java +++ b/src/Graph.java @@ -86,7 +86,7 @@ class Graph { } public Edge getShortestPathALT(int startNumber, int destinationNumber) throws Exception { - PriorityQueue<Edge> priorityQueue = new PriorityQueue<>(new Comparators.AltComparator(Utils.fileToArray("testOslo.txt",adjacencyList.size()),3430400)); + PriorityQueue<Edge> priorityQueue = new PriorityQueue<>(new Comparators.AltComparator(Utils.fileToArray("testOsloNew.txt",adjacencyList.size()),3430400)); int nodeSize = adjacencyList.size(); int[] pathWeight = new int[nodeSize]; Arrays.fill(pathWeight, Integer.MAX_VALUE); diff --git a/src/Main.java b/src/Main.java index a58c4124654f09ec416c7ac311af73094e6d0b18..fe0e4d2596b8fb39a9cb5f065cf89ac8ef806afa 100644 --- a/src/Main.java +++ b/src/Main.java @@ -6,21 +6,13 @@ public class Main { try { Graph g = new Graph("noder.txt"); g.loadEdges("kanter.txt"); - g.loadNodes("nodes.txt"); - Edge lastEdge= g.getShortestPath(4247796,232073); + Edge lastEdge= g.getShortestPathALT(4247796,232073); int sum = 0; - List<Integer> destinations = new ArrayList<>(); while (lastEdge!=null) { - destinations.add(lastEdge.getDestination()); + System.out.println(lastEdge.getDestination()); sum += lastEdge.drivingTime; lastEdge = lastEdge.previousEdge; } - List<Node> nodes = g.getNodes(); - for (Integer destination: destinations) { - Node node = nodes.get(destination); - System.out.println(node.getLatitude() +","+node.getLongitude()); - } - System.out.println(nodes.get(4247796).getLatitude()+","+nodes.get(4247796).getLongitude()); System.out.println(4247796); System.out.println("-------------------------------------------"); System.out.println(Utils.formatTime(sum));