Changeset 36 for branches/localSpectral/src/data

Timestamp:

Jan 6, 2011, 9:41:42 AM (14 years ago)

Author:

toshi

Message:

ultimo commit

File:

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

branches/localSpectral/src/data/GraphBuilder.java

@@ -2 +2 @@
 package data;
 
+import GraphType.DirectedDenseGraph;
 import clustering.Edge;
-import clustering.VertexString;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
 import edu.uci.ics.jung.graph.Graph;
 import edu.uci.ics.jung.graph.SparseGraph;
-import java.io.BufferedInputStream;
 import java.io.BufferedReader;
 import java.io.DataInputStream;
@@ -21 +20 @@
 public class GraphBuilder {
 
-    Graph<String,Edge<String>> graph;
+    Graph<String,Integer> graph;
 
     public GraphBuilder(boolean directed){
         if (directed)
-           graph = new DirectedSparseGraph<String, Edge<String>>();
+            graph = new DirectedDenseGraph<String, Integer>();
+           //graph = new DirectedSparseGraph<String, Integer>();
 
         else
-            graph = new SparseGraph<String, Edge<String>>();
+            graph = new SparseGraph<String, Integer>();
     }
 
-    public Graph<String, Edge<String>> getGraph() {
+    public Graph<String, Integer> getGraph() {
         return graph;
     }
 
-    public void buildGraphFromARFF(String path, int maxreadline){
+    public void buildGraphFromCVS(String path, int maxreadline){
         try {
             FileInputStream fstream = new FileInputStream(path);
@@ -41 +41 @@
             BufferedReader br = new BufferedReader(new InputStreamReader(in));
 
-            Set<String> vertex = new HashSet<String>();
-
             String read;
             int edge=0;
-            int count=0;
-            while(((read = br.readLine()) != null) && (count < maxreadline)){
-                count++;
-                if(!(read.contains("@DATA") || read.contains("@RELATION") || read.contains("@ATTRIBUTE") || read.trim().isEmpty())){
-                    String[] splitted = read.trim().split(",");
-                    vertex.addAll(Arrays.asList(splitted));
-                    graph.addEdge(new Edge<String>(splitted[0], splitted[1]), splitted[0], splitted[1]);
+            String[] splitted;
+            while((read = br.readLine()) != null){
+                if(!read.trim().isEmpty()){
+                    splitted = read.trim().split(",");
+                    graph.addEdge(edge, splitted[0], splitted[1]);
                     edge++;
                 }