Changeset 20 for src/main/java/weka/clusterers/forMetisMQI/GraphAlgorithms.java

Timestamp:

Sep 30, 2010, 5:33:45 PM (14 years ago)

Author:

gnappo

Message:

Aggiunto metodo per stampare i grafi in formato utile per kmetis; modificato politica di azione di mqi, ora agisce sulla partizione piu` grande.

File:

• src/main/java/weka/clusterers/forMetisMQI/GraphAlgorithms.java (modified) (4 diffs)

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

@@ -81 +81 @@
          */
         static public Set<Set<Node>> metisMqi(UndirectedGraph g, int numberOfCluster, int sizeFinerGraph) {
-                System.out.println("VERTEX: " + g.getVertexCount());
-                System.out.println("EDGE: " + g.getEdgeCount());
+                System.out.println("Vertex count: " + g.getVertexCount());
+                System.out.println("Edges count: " + g.getEdgeCount());
                 Iterator<Node> iNodes = g.getVertices().iterator();
                 int degreeCounter = 0;
@@ -95 +95 @@
 //              Util.viewGraph(g);
                 for (int i = 0; i < numberOfCluster; i++) {
-                        Bisection partition = metis(g,sizeFinerGraph);
-                        System.out.println("Partizione iniziale (Metis)");
-//                      System.out.println("Edge-cut: " + partition.edgeCut() / 2);
+//                      Bisection partition = metis(g,sizeFinerGraph);
+                        Bisection partition = new Bisection(g);
+                        System.out.print("Partizione iniziale: ");
+                        System.out.print("V1: " + partition.getSubgraph().getVertexCount());
+                        System.out.print(" V2: " + partition.getComplement().getVertexCount());
+                        System.out.println(" EC: " + partition.edgeCut() * 0.5);
                         System.out.println("Conductance: " + 
                                         ((double)partition.edgeCut() / 2) / Math.min(partition.getSubgraph().totalDegree(),partition.getComplement().totalDegree()));
@@ -107 +110 @@
                         Bisection mqiBisection = new Bisection(new Subgraph(g,cluster));
                         System.out.println("Partizione raffinata (MQI)");
-//                      System.out.println("Edge-cut: " + mqiBisection.edgeCut() / 2);
                         double newConductance = ((double)mqiBisection.edgeCut() / 2) / Math.min(mqiBisection.getSubgraph().totalDegree(),mqiBisection.getComplement().totalDegree());
                         System.out.println("Conductance: " + newConductance);
@@ -117 +119 @@
                         }
                         
+                        System.out.println();
                         Iterator<Node> clustersNode = cluster.iterator();
                         while(clustersNode.hasNext()){