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

Timestamp:

Oct 6, 2010, 4:02:40 PM (14 years ago)

Author:

gnappo

Message:

Inserita gestione pannelli per la visualizzazione grafi.

File:

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

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

@@ -11 +11 @@
 import weka.clusterers.forMetisMQI.graph.UndirectedGraph;
 import weka.clusterers.forMetisMQI.util.CoarserGraphElement;
+import weka.clusterers.forMetisMQI.util.Configuration;
 import weka.clusterers.forMetisMQI.util.GraphsFrame;
 import weka.clusterers.forMetisMQI.util.Util;
@@ -68 +69 @@
                 if (stack.size() > 0) {
                         partition = KL(stack.peek().getContracted());
+                        if(Configuration.instance().getVerboseLevel() > 1) {
+                                GraphsFrame.instance().addPanel(Util.panelContractedGraph(stack.peek()));
+                                GraphsFrame.instance().addPanel(Util.panelContractedGraph(stack.peek(),partition.getSmallerSubgraph().createInducedSubgraph().getVertices()));
+                        }
                         partition = Uncoarse.uncoarse(stack, partition);
                 }
@@ -81 +86 @@
          * @param sizeFinerGraph
          */
-        static public Set<Set<Node>> metisMqi(UndirectedGraph g, int numberOfCluster, int sizeFinerGraph, boolean randomBisection) {
-                GraphsFrame gf = new GraphsFrame("Prova");
+        static public Set<Set<Node>> metisMqi(UndirectedGraph g) {
+                int numberOfCluster = Configuration.instance().getNumberOfClusters();
+                boolean randomBisection = Configuration.instance().isRandomBisection();
+                int sizeFinerGraph = Configuration.instance().getSizeFinerGraph();
+                int verboseLevel = Configuration.instance().getVerboseLevel();
+                GraphsFrame gf = GraphsFrame.instance();
                 System.out.println("Vertex count: " + g.getVertexCount());
                 System.out.println("Edges count: " + g.getEdgeCount());
-                Iterator<Node> iNodes = g.getVertices().iterator();
-                int degreeCounter = 0;
-                while(iNodes.hasNext()) {
-                        Node node = iNodes.next();
-                        if(g.degree(node) == 1) {
-                                degreeCounter++;
-                        }
-                }
                 Set<Set<Node>> clusters = new HashSet<Set<Node>>();
                 UndirectedGraph gclone = g.clone();
-                gf.addPanel(Util.panelGraph(gclone));
                 for (int i = 0; i < numberOfCluster; i++) {
                         Bisection bisection = null;
+                        if(verboseLevel > 1)
+                                gf.addPanel(Util.panelGraph(g.clone()));
                         if(!randomBisection)
                                 bisection = metis(g,sizeFinerGraph);
                         else
                                 bisection = new Bisection(g);
+                        
+                        if(verboseLevel > 1)
+                                gf.addPanel(Util.panelCluster(g.clone(),bisection.getSmallerSubgraph().createInducedSubgraph().getVertices()));
+                        
                         System.out.print("Partizione iniziale: ");
                         System.out.print("V1: " + bisection.getSubgraph().getVertexCount());
@@ -127 +133 @@
                         }
                 }
-                gf.addPanel(Util.panelClusters(gclone, clusters));
+                if(verboseLevel > 0)
+                        gf.addPanel(Util.panelClusters(gclone, clusters));
                 gf.setVisible(true);
                 return clusters;