Changeset 32 for branches/localSpectral/src/data

Timestamp:

Oct 21, 2010, 9:47:43 PM (14 years ago)

Author:

toshi

Message:

 

File:

• branches/localSpectral/src/data/GraphBuilder.java (modified) (3 diffs)

branches/localSpectral/src/data/GraphBuilder.java

@@ -2 +2 @@
 package data;
 
+import clustering.Edge;
+import clustering.VertexString;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.SparseGraph;
@@ -16 +18 @@
 
 
-public class GraphBuilder<V,E> {
+public class GraphBuilder {
 
-    Graph<String,Integer> graph;
+    Graph<String,Edge<String>> graph;
 
     public GraphBuilder(){
-        graph = new SparseGraph<String, Integer>();
+        graph = new SparseGraph<String, Edge<String>>();
 
     }
 
-    public Graph<String, Integer> getGraph() {
+    public Graph<String, Edge<String>> getGraph() {
         return graph;
     }
@@ -45 +47 @@
                     String[] splitted = read.trim().split(",");
                     vertex.addAll(Arrays.asList(splitted));
-                    graph.addEdge(edge, splitted[0], splitted[1]);
+                    graph.addEdge(new Edge<String>(splitted[0], splitted[1]), splitted[0], splitted[1]);
                     edge++;
                 }