Vertex now extends HeapElt

CS311_final_project/src/main/AdjacencyList.java

@@ -21,7 +21,7 @@ public class AdjacencyList {
 		ArrayList<Edge> neighbors = new ArrayList<Edge>();
 		for (int i = 0; i < adjList.size(); i++) {
 		    Vertex testVertex = adjList.get(i);
-		    int numDifferences = numDifferences(testVertex.getKey(), newWord);
+		    int numDifferences = numDifferences((String)testVertex.getRecord(), newWord);
 		    if (2 >= numDifferences) {
 		    	int weight = 0;
 		    	if(numDifferences == 1)
@@ -55,7 +55,7 @@ public class AdjacencyList {
 	StringBuffer out = new StringBuffer();
 	for (int i = 0; i < v.getEdges().size(); i++) {
 	    int neighborHandle = v.getEdges().get(i).toVertex;
-	    String neighborKey = adjList.get(neighborHandle).getKey();
+	    String neighborKey = (String)adjList.get(neighborHandle).getRecord();
 	    out.append(neighborKey + " (" + v.getEdges().get(i).weight + "), ");
 	}
 	return out.toString();
@@ -65,7 +65,7 @@ public class AdjacencyList {
 	StringBuffer out = new StringBuffer();
 	for (int i = 0; i < v.getEdges().size(); i++) {
 	    int neighborHandle = v.getEdges().get(i).toVertex;
-	    String neighborKey = adjList.get(neighborHandle).getKey();
+	    String neighborKey = (String)adjList.get(neighborHandle).getRecord();
 	    out.append("     " + neighborKey + " ("
 		    + v.getEdges().get(i).weight + ")  ");
 	    if (i % 6 == 5)
@@ -80,7 +80,7 @@ public class AdjacencyList {
 
     public int findStringHandle(String s) {
 	for (int i = 0; i < adjList.size(); i++) {
-	    if (s.equals(adjList.get(i).getKey()))
+	    if (s.equals(adjList.get(i).getRecord()))
 		return i;
 	}
 	return -1;
@@ -92,7 +92,7 @@ public class AdjacencyList {
 	out.append("------------------|------------\n");
 	for (int i = 0; i < adjList.size(); i++) {
 	    out.append(String
-		    .format("%5d      %5s", i, adjList.get(i).getKey())
+		    .format("%5d      %5s", i, adjList.get(i).getRecord())
 		    + "  | " + neighborsToString(adjList.get(i)) + "\n");
 	}
 	return out.toString();
@@ -108,8 +108,6 @@ public class AdjacencyList {
     	}
     	getVertexFromHandle(startingVertex).setDist(0);
     	
-    	
-    	
     }
     
     private ArrayList<Integer> findPath(int start, int end, ArrayList<Integer> path){

CS311_final_project/src/main/Vertex.java

 package main;
 
+import heap.HeapElt;
 import java.util.ArrayList;
 
-public class Vertex {
+public class Vertex extends HeapElt{
 
-    private String key;
-    private int handle;
     private ArrayList<Edge> edges;
     private int pred;
     private int dist; 
 
     public Vertex(String word, int handle, ArrayList<Edge> neighbors) {
-	this.key = word;
+	this.record = word;
 	this.handle = handle;
 	this.edges = neighbors;
 	pred = -1;
@@ -42,10 +41,6 @@ public class Vertex {
 	this.handle = handle;
     }
 
-    public String getKey() {
-	return key;
-    }
-
     public void addEdge(int n, int weight) {
 	edges.add(new Edge(n, weight));
     }