darecoder
diff --git a/‎.idea/workspace.xml
Copy file name to clipboardExpand all lines: .idea/workspace.xml
+12-10Lines changed: 12 additions & 10 deletions b/‎.idea/workspace.xml
Copy file name to clipboardExpand all lines: .idea/workspace.xml
+12-10Lines changed: 12 additions & 10 deletions
diff --git a/‎out/production/Crux/com/company/Lecture20/Questions.class
Copy file name to clipboard
-36 Bytes b/‎out/production/Crux/com/company/Lecture20/Questions.class
Copy file name to clipboard
-36 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapGraph$Vertex.class
Copy file name to clipboard
0 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapGraph$Vertex.class
Copy file name to clipboard
0 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapGraph.class
Copy file name to clipboard
0 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapGraph.class
Copy file name to clipboard
0 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$1.class
Copy file name to clipboard
0 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$1.class
Copy file name to clipboard
0 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$2.class
Copy file name to clipboard
0 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$2.class
Copy file name to clipboard
0 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$Edge.class
Copy file name to clipboard
0 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$Edge.class
Copy file name to clipboard
0 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$Vertex.class
Copy file name to clipboard
-99 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph$Vertex.class
Copy file name to clipboard
-99 Bytes
diff --git a/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph.class
Copy file name to clipboard
24 Bytes b/‎out/production/Crux/com/company/Lecture22/AdjMapWeightGraph.class
Copy file name to clipboard
24 Bytes
diff --git a/‎src/com/company/Lecture22/AdjMapGraph.java
Copy file name to clipboardExpand all lines: src/com/company/Lecture22/AdjMapGraph.java
+2-1Lines changed: 2 additions & 1 deletion b/‎src/com/company/Lecture22/AdjMapGraph.java
Copy file name to clipboardExpand all lines: src/com/company/Lecture22/AdjMapGraph.java
+2-1Lines changed: 2 additions & 1 deletion
diff --git a/‎src/com/company/Lecture22/AdjMapWeightGraph.java
Copy file name to clipboardExpand all lines: src/com/company/Lecture22/AdjMapWeightGraph.java
+9-14Lines changed: 9 additions & 14 deletions b/‎src/com/company/Lecture22/AdjMapWeightGraph.java
Copy file name to clipboardExpand all lines: src/com/company/Lecture22/AdjMapWeightGraph.java
+9-14Lines changed: 9 additions & 14 deletions
@@ -2,7 +2,8 @@
 
 import java.util.*;
 
-public class AdjMapGraph<E> {
+public class
+AdjMapGraph<E> {
 
     private Map<E, Vertex> vertices = new HashMap<E, Vertex>();
 
 
@@ -8,16 +8,14 @@ public class AdjMapWeightGraph<E> {
 
     private class Vertex{
         E value;
-        Map<E, Vertex> neighbours = new HashMap<E, Vertex>();
-        Map<E, Integer> weights = new HashMap<E, Integer>();
+        Map<Vertex, Integer> neighbours = new HashMap<Vertex, Integer>();
 
         public Vertex(E value) {
             this.value = value;
         }
 
         public void addNeighbour(Vertex vertex, Integer weight){
-            neighbours.put(vertex.value,vertex);
-            weights.put(vertex.value,weight);
+            neighbours.put(vertex, weight);
         }
     }
 
@@ -36,8 +34,8 @@ public Edge(Vertex start, Vertex end, Integer weight) {
     public Integer kruskal(){
         ArrayList<Edge> list = new ArrayList<Edge>();
         for(Vertex start : vertices.values()){
-            for(Vertex end : start.neighbours.values()){
-                Integer weight = start.weights.get(end.value);
+            for(Vertex end : start.neighbours.keySet()){
+                Integer weight = start.neighbours.get(end.value);
                 list.add(new Edge(start, end, weight));
             }
         }
@@ -63,7 +61,6 @@ public int compare(Edge o1, Edge o2) {
     }
 
     public int prims(){
-
         Vertex start = vertices.values().iterator().next();
         Set<Vertex> visited = new HashSet<Vertex>();
 
@@ -75,28 +72,26 @@ public int compare(Edge o1, Edge o2) {
         });
 
         visited.add(start);
-        for (Vertex end : start.neighbours.values()){
-            int weight = start.weights.get(end.value);
+        for (Vertex end : start.neighbours.keySet()){
+            int weight = start.neighbours.get(end.value);
             queue.add(new Edge(start, end, weight));
         }
-
         int total = 0;
         while (!queue.isEmpty()){
             Edge edge = queue.remove();
             if (!visited.contains(edge.end)){
                 total += edge.weight;
 
                 Vertex temp_s = edge.end;
-                for (Vertex temp_e : temp_s.neighbours.values()){
+                for (Vertex temp_e : temp_s.neighbours.keySet()){
                     if (!visited.contains(temp_e)){
-                        int weight = temp_s.weights.get(temp_e.value);
+                        int weight = temp_s.neighbours.get(temp_e.value);
                         queue.add(new Edge(temp_s, temp_e, weight));
 
                     }
                 }
             }
         }
-
         return total;
     }
 
@@ -170,7 +165,7 @@ public void DFT(E value){
             Vertex top = stack.pop();
             System.out.print(top.value + " ");
 
-            for (Vertex vertex : top.neighbours.values()){
+            for (Vertex vertex : top.neighbours.keySet()){
                 if(!set.contains(vertex)){
                     stack.push(vertex);
                     set.add(vertex);