Changeset 9 for src/main/java/weka/clusterers/forMetisMQI/MQI.java

Timestamp:

Sep 14, 2010, 2:11:28 PM (14 years ago)

Author:

gnappo

Message:

Migrato il resto del codice verso Jung.

File:

• src/main/java/weka/clusterers/forMetisMQI/MQI.java (modified) (7 diffs)

src/main/java/weka/clusterers/forMetisMQI/MQI.java

@@ -6 +6 @@
 import javax.swing.JFrame;
 
-import edu.uci.ics.jung.algorithms.layout.CircleLayout;
+import edu.uci.ics.jung.algorithms.layout.KKLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
@@ -16 +16 @@
         
         public static void viewGraph(Graph<Node, Edge> g){
-                Layout<Node, Edge> layout = new CircleLayout<Node, Edge>(g);
+                Layout<Node, Edge> layout = new KKLayout<Node, Edge>(g);
                 layout.setSize(new Dimension(300,300)); // sets the initial size of the space
                 // The BasicVisualizationServer<V,E> is parameterized by the edge types
@@ -33 +33 @@
                 Subgraph A = null;
                 Subgraph B = null;
-                if(partition.getSubgraph().size() > partition.getComplement().size()) {
+                if(partition.getSubgraph().getVertexCount() > partition.getComplement().getVertexCount()) {
                         A = partition.getSubgraph();
                         B = partition.getComplement();
@@ -41 +41 @@
                         B = partition.getSubgraph();
                 }
-                int a = A.size();
+                int a = A.getVertexCount();
                 int c = partition.edgeCut();
                 
                 
                 Graph<Node,Edge> g = new DirectedSparseGraph<Node, Edge>();
-                Iterator<Integer> nodes =  A.iterator();
+                Iterator<Node> nodes =  A.iterator();
                 while(nodes.hasNext()) {
-                        int u = nodes.next();
-                        g.addVertex(new Node(Integer.toString(u)));
+                        Node u = nodes.next();
+                        g.addVertex(u);
                 }
                 
@@ -55 +55 @@
                 int id = 0;
                 while(nodes.hasNext()) {
-                        int u = nodes.next();
-                        Iterator<Integer> neighbors = A.getNeighbours(u).iterator();
+                        Node u = nodes.next();
+                        Iterator<Node> neighbors = A.getNeighbors(u).iterator();
                         while(neighbors.hasNext()) {
-                                int v = neighbors.next();
-                                g.addEdge(new Edge(Integer.toString(id),A.getWeight(u, v),a),new Node(Integer.toString(u)),new Node(Integer.toString(v)));
+                                Node v = neighbors.next();
+                                g.addEdge(new Edge(Integer.toString(id),A.getWeight(u, v),a),u,v);
                                 id++;
                         }
@@ -72 +72 @@
                 nodes =  B.iterator();
                 while(nodes.hasNext()) {
-                        int u = nodes.next();
-                        Iterator<Integer> neighbors = B.getGraph().getNeighbors(u).iterator();
+                        Node u = nodes.next();
+                        Iterator<Node> neighbors = B.getGraph().getNeighbors(u).iterator();
                         while(neighbors.hasNext()) {
-                                int v = neighbors.next();
+                                Node v = neighbors.next();
                                 if(A.contains(v)) {
-                                        g.addEdge(new Edge(Integer.toString(id),1,a),source,new Node(Integer.toString(v)));
+                                        g.addEdge(new Edge(Integer.toString(id),1,a),source,v);
                                         id++;
                                 }
@@ -85 +85 @@
                 nodes =  A.iterator();
                 while(nodes.hasNext()) {
-                        int u = nodes.next();
-                        g.addEdge(new Edge(Integer.toString(id),1,c),new Node(Integer.toString(u)),sink);
+                        Node u = nodes.next();
+                        g.addEdge(new Edge(Integer.toString(id),1,c),u,sink);
                         id++;
                 }