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

Timestamp:

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

Author:

gnappo

Message:

Inserita gestione pannelli per la visualizzazione grafi.

Location:

src/main/java/weka/clusterers/forMetisMQI

Files:

• GraphAlgorithms.java (modified) (4 diffs)
• MQI.java (modified) (3 diffs)
• util/Configuration.java (added)
• util/ContractedVertexTransformer.java (added)
• util/GraphsFrame.java (modified) (2 diffs)
• util/Util.java (modified) (8 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;

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

@@ -19 +19 @@
 import edu.uci.ics.jung.graph.DirectedGraph;
 import edu.uci.ics.jung.graph.DirectedSparseGraph;
+import weka.clusterers.forMetisMQI.util.Configuration;
+import weka.clusterers.forMetisMQI.util.GraphsFrame;
 import weka.clusterers.forMetisMQI.util.Util;
 
@@ -199 +201 @@
                         }
                         alg.evaluate();
-//                      Util.viewFlowGraph(directedGraph, edgeFlowMap);
+                        if(Configuration.instance().getVerboseLevel() > 1)
+                                GraphsFrame.instance().addPanel(Util.panelFlowGraph(directedGraph, edgeFlowMap));
                         System.out.println("MAX FLOW: " + alg.getMaxFlow() + " THRESHOLD: "
                                         + maxFlowThreshold);
@@ -210 +213 @@
                                         bisection.getGraph(), cluster));
 //                              System.out.println("REFINED BISECTION: " + bisection.toString());
+                                if(Configuration.instance().getVerboseLevel() > 1)
+                                        GraphsFrame.instance().addPanel(Util.panelCluster(bisection.getGraph(), cluster));
                         } else
                                 finished = true;

src/main/java/weka/clusterers/forMetisMQI/util/GraphsFrame.java

@@ -16 +16 @@
          */
         private static final long serialVersionUID = 1L;
+        
+        private static GraphsFrame instance = null;
 
         private int numberOfPanels = 0;
@@ -23 +25 @@
         private JButton nextButton = null;
         private JButton prevButton = null;
+        
+        public static GraphsFrame instance() {
+                if(instance == null) {
+                        instance = new GraphsFrame("Graphs Frame");
+                }
+                return instance;
+        }
+        
+        private GraphsFrame() {
+                
+        }
 
-        public GraphsFrame(String name) {
+        private GraphsFrame(String name) {
                 super(name);
                 setBounds(new Rectangle(800, 700));
+                setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+
 
                 graphPanel = new JPanel();

src/main/java/weka/clusterers/forMetisMQI/util/Util.java

@@ -4 +4 @@
 import java.awt.Dimension;
 import java.awt.Paint;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -9 +10 @@
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
-import javax.swing.JFrame;
 import javax.swing.JPanel;
 
@@ -20 +21 @@
 import weka.clusterers.forMetisMQI.graph.UndirectedGraph;
 import edu.uci.ics.jung.algorithms.layout.FRLayout;
+import edu.uci.ics.jung.algorithms.layout.KKLayout;
 import edu.uci.ics.jung.algorithms.layout.Layout;
 import edu.uci.ics.jung.graph.Graph;
@@ -27 +29 @@
 public class Util {
         
-        public static JPanel panelCluster(Graph<Node, Edge> g, Set<Node> cluster) {
+        public static JPanel panelCluster(Graph<Node, Edge> g, Collection<Node> cluster) {
+                Set<Node> setNodes = new HashSet<Node>();
+                setNodes.addAll(cluster);
                 Set<Set<Node>> clusters = new HashSet<Set<Node>>();
-                clusters.add(cluster);
+                clusters.add(setNodes);
                 return panelClusters(g, clusters);
         }
         
+        public static JPanel panelClusters(Graph<Node, Edge> g, Set<Set<Node>> clusters) {
+                return panelClusters(g,clusters,new ToStringLabeller<Node>());
+        }
         
-        public static JPanel panelClusters(Graph<Node, Edge> g, Set<Set<Node>> clusters) {
-                Layout<Node, Edge> layout = new FRLayout<Node, Edge>(g);
+        public static JPanel panelClusters(Graph<Node, Edge> g, Set<Set<Node>> clusters, Transformer<Node,String> transformer) {
+                Layout<Node, Edge> layout = new KKLayout<Node, Edge>(g);
                 layout.setSize(new Dimension(800, 600)); // sets the initial size of the space
                 // The BasicVisualizationServer<V,E> is parameterized by the edge types
@@ -80 +87 @@
                 vv.setPreferredSize(new Dimension(800, 600)); // Sets the viewing area
                                                                                                                 // size
-                vv.getRenderContext().setVertexLabelTransformer(
-                                new ToStringLabeller<Node>());
-                vv.getRenderContext().setEdgeLabelTransformer(
-                                new ToStringLabeller<Edge>());
+                vv.getRenderContext().setVertexLabelTransformer(transformer);
                 vv.getRenderContext().setVertexFillPaintTransformer(vertexPaint);
                 return vv;
@@ -89 +93 @@
         
         public static JPanel panelGraph(Graph<Node, Edge> g){
-                Layout<Node, Edge> layout = new FRLayout<Node, Edge>(g);
+                Layout<Node, Edge> layout = new KKLayout<Node, Edge>(g);
                 layout.setSize(new Dimension(800,600)); // sets the initial size of the space
                 // The BasicVisualizationServer<V,E> is parameterized by the edge types
@@ -96 +100 @@
                 vv.setPreferredSize(new Dimension(800,600)); //Sets the viewing area size
                 vv.getRenderContext().setVertexLabelTransformer(new ToStringLabeller<Node>());
-                vv.getRenderContext().setEdgeLabelTransformer(new ToStringLabeller<Edge>());
+                vv.getRenderContext().setEdgeLabelTransformer(
+                                new Transformer<Edge, String>() {
+                                        public String transform(Edge e) {
+                                                return "";
+                                        }
+                                });
                 return vv;
         }
@@ -120 +129 @@
                 return vv;
         }
+        
+        static public JPanel panelContractedGraph(CoarserGraphElement cge, Collection<Node> cluster) {
+                Set<Node> setNodes = new HashSet<Node>();
+                setNodes.addAll(cluster);
+                Set<Set<Node>> clusters = new HashSet<Set<Node>>();
+                clusters.add(setNodes);
+                return panelClusters(cge.getContracted(), clusters, new ContractedVertexTransformer(cge));
+        }
+        
+        static public JPanel panelContractedGraph(CoarserGraphElement cge) {
+                Layout<Node, Edge> layout = new KKLayout<Node, Edge>(cge.getContracted());
+                layout.setSize(new Dimension(800,600)); // sets the initial size of the space
+                // The BasicVisualizationServer<V,E> is parameterized by the edge types
+                BasicVisualizationServer<Node,Edge> vv =
+                new BasicVisualizationServer<Node,Edge>(layout);
+                vv.setPreferredSize(new Dimension(800,600)); //Sets the viewing area size
+                vv.getRenderContext().setVertexLabelTransformer(new ContractedVertexTransformer(cge));
+                return vv;
+        }
+
         
         /**